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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
index db1e85a..8c078aa 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
@@ -22,7 +22,8 @@ package com.c2kernel.lifecycle.instance.predefined;
 

 import java.util.Arrays;

 

-import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.PersistencyException;

 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.ItemPath;

@@ -48,19 +49,18 @@ public class AddC2KObject 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, PersistencyException {

 

     	String[] params = getDataList(requestData);

         if (Logger.doLog(3)) Logger.msg(3, "AddC2KObject: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));

-        try

-        {

-			C2KLocalObject obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(params[0]);

-			Gateway.getStorage().put(item, obj, null );

-			return requestData;

-        }

-        catch( Exception ex )

-        {

-        	throw unknownException(ex);

-        }

+        if (params.length != 1) throw new InvalidData("AddC2KObject: Invalid parameters "+Arrays.toString(params));

+		C2KLocalObject obj;

+		try {

+			obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(params[0]);

+		} catch (Exception e) {

+			throw new InvalidData("AddC2KObject: Could not unmarshall new object: "+params[0]);

+		}

+		Gateway.getStorage().put(item, obj, null );

+		return requestData;

     }

 }
\ No newline at end of file