Huge exception overhaul: Merged ClusterStorageException with

PersistencyException. Replaced MembershipException with
InvalidCollectionModification CORBA Exception. Made all predef steps
throw more accurate exceptions when they go wrong, and let more
exceptions bubble through from underneath.

1 files changed, 16 insertions, 10 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
index 139bc55..5e0505e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
@@ -23,7 +23,12 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 

 

 

-import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.CannotManage;

+import com.c2kernel.common.InvalidCollectionModification;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectAlreadyExists;

+import com.c2kernel.common.ObjectCannotBeUpdated;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.entity.imports.ImportItem;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

@@ -42,15 +47,16 @@ public class CreateNewItem extends PredefinedStep
 	//requestdata is xmlstring

     @Override

 	protected String runActivityLogic(AgentPath agent, ItemPath item,

-			int transitionID, String requestData) throws InvalidDataException {

+			int transitionID, String requestData) throws InvalidData, ObjectCannotBeUpdated, ObjectNotFound, CannotManage, ObjectAlreadyExists, InvalidCollectionModification {

     	

-        try {

-            ImportItem newItem = (ImportItem)Gateway.getMarshaller().unmarshall(requestData);

-            newItem.create(agent, false);

-            return requestData;

-        } catch (Exception ex) {

-            Logger.error(ex);

-            throw new InvalidDataException("Error creating item", "");

-        }

+        ImportItem newItem;

+		try {

+			newItem = (ImportItem)Gateway.getMarshaller().unmarshall(requestData);

+		} catch (Exception e) {

+			Logger.error(e);

+			throw new InvalidData("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);

+		}

+        newItem.create(agent, false);

+        return requestData;

     }

 }