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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java b/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java
index cb4ec45..eabf46a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java
@@ -21,7 +21,7 @@
 package com.c2kernel.lifecycle.instance;

 import java.util.StringTokenizer;

 

-import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.InvalidData;

 import com.c2kernel.graph.model.DirectedEdge;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.ItemPath;

@@ -41,7 +41,7 @@ public class OrSplit extends Split
 		super();

 	}

 	@Override

-	public void runNext(AgentPath agent, ItemPath itemPath) throws InvalidDataException

+	public void runNext(AgentPath agent, ItemPath itemPath) throws InvalidData

 	{

 		String nexts;

 		String scriptName = (String) getProperties().get("RoutingScriptName");

@@ -50,7 +50,7 @@ public class OrSplit extends Split
 			nexts = this.evaluateScript(scriptName, scriptVersion, itemPath).toString();

 		} catch (ScriptingEngineException e) {

 			Logger.error(e);

-			throw new InvalidDataException("Error running routing script "+scriptName+" v"+scriptVersion, null);

+			throw new InvalidData("Error running routing script "+scriptName+" v"+scriptVersion);

 		}

 		StringTokenizer tok = new StringTokenizer(nexts, ",");

 		Logger.msg(7, tok.countTokens() + " nexts to activate:" + nexts);

@@ -82,7 +82,7 @@ public class OrSplit extends Split
 			Logger.error(e);

 		}

 		if (active == 0)

-			throw new InvalidDataException("No nexts were activated!", null);

+			throw new InvalidData("No nexts were activated!");

 	}