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, 22 insertions, 12 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
index 6caf25e..ffe8950 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
@@ -20,7 +20,11 @@
  */

 package com.c2kernel.lifecycle.instance.predefined.server;

 

-import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.CannotManage;

+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.ImportAgent;

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

 import com.c2kernel.lookup.AgentPath;

@@ -39,19 +43,25 @@ public class CreateNewAgent 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, ObjectNotFound, ObjectCannotBeUpdated, CannotManage, ObjectAlreadyExists {

     	

         String redactedRequestData;

-        try {

-            ImportAgent newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);

-            newAgent.create(agent, true);

-            newAgent.setPassword("REDACTED");

-            redactedRequestData = Gateway.getMarshaller().marshall(newAgent);

-            return redactedRequestData;

-        } catch (Exception ex) {

-            Logger.error(ex);

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

-        }

 

+        ImportAgent newAgent;

+		try {

+			newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);

+		} catch (Exception e1) {

+			Logger.error(e1);

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

+		}

+        newAgent.create(agent, true);

+        newAgent.setPassword("REDACTED");

+        try {

+			redactedRequestData = Gateway.getMarshaller().marshall(newAgent);

+		} catch (Exception e) {

+			Logger.error(e);

+			throw new InvalidData("CreateNewAgent: Couldn't marshall new Agent for outcome: "+newAgent);

+		}

+        return redactedRequestData;

     }

 }