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, 15 insertions, 10 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
index 49231ea..de05dec 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.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.ImportRole;

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

 import com.c2kernel.lookup.AgentPath;

@@ -39,16 +43,17 @@ public class CreateNewRole 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, ObjectAlreadyExists, ObjectCannotBeUpdated, CannotManage, ObjectNotFound {

     	

-        try {

-            ImportRole newRole = (ImportRole)Gateway.getMarshaller().unmarshall(requestData);

-            newRole.create(agent, true);

-            return requestData;

-        } catch (Exception ex) {

-            Logger.error(ex);

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

-        }

 

+    	ImportRole newRole;

+		try {

+			newRole = (ImportRole)Gateway.getMarshaller().unmarshall(requestData);

+		} catch (Exception e) {

+			Logger.error(e);

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

+		}

+    	newRole.create(agent, true);

+    	return requestData;

     }

 }