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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
index 0210fe3..e17919d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
@@ -22,12 +22,12 @@ 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.events.Event;

 import com.c2kernel.events.History;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.persistency.ClusterStorageException;

 import com.c2kernel.persistency.TransactionManager;

 import com.c2kernel.persistency.outcome.Outcome;

 import com.c2kernel.persistency.outcome.Viewpoint;

@@ -54,7 +54,7 @@ public class Import 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, "Import: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));

@@ -63,7 +63,7 @@ public class Import extends PredefinedStep
         int split2 = params[0].indexOf(':');

         

         if (split1 == -1)

-        	throw new InvalidDataException("Import: Invalid parameters "+Arrays.toString(params));

+        	throw new InvalidData("Import: Invalid parameters "+Arrays.toString(params));

         

         requestData = params[1];

 

@@ -95,10 +95,9 @@ public class Import extends PredefinedStep
 			storage.put(item, new Viewpoint(item, schemaName, viewpoint, schemaVersion, event.getID()), locker);

 			if (!"last".equals(viewpoint))

 				storage.put(item, new Viewpoint(item, schemaName, "last", schemaVersion, event.getID()), locker);

-		} catch (ClusterStorageException e) {

-			Logger.error(e);

+		} catch (PersistencyException e) {

 			storage.abort(locker);

-			throw new InvalidDataException("Import: Could not store imported outcome. Rolled back.", "");

+			throw e;

 		}

 		storage.commit(locker);

 		return requestData;