More

1 files changed, 16 insertions, 8 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/XOrSplit.java b/src/main/java/com/c2kernel/lifecycle/instance/XOrSplit.java
index 25baf0b..6c11e92 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/XOrSplit.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/XOrSplit.java
@@ -3,9 +3,11 @@ package com.c2kernel.lifecycle.instance;
 import java.util.ArrayList;

 import java.util.StringTokenizer;

 

+import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.graph.model.DirectedEdge;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.scripting.ScriptingEngineException;

+import com.c2kernel.utils.Logger;

 

 /**

  * @version $Revision: 1.23 $ $Date: 2006/03/03 13:52:21 $

@@ -22,12 +24,18 @@ public class XOrSplit extends Split
     }

 

     @Override

-	public void runNext(AgentPath agent) throws ScriptingEngineException

+	public void runNext(AgentPath agent, int itemSysKey) throws InvalidDataException

     {

         ArrayList<DirectedEdge> nextsToFollow = new ArrayList<DirectedEdge>();

-        String nexts = this.evaluateScript(

-            (String) getProperties().get("RoutingScriptName"),

-            (String) getProperties().get("RoutingScriptVersion")).toString();

+        String nexts;

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

+		String scriptVersion = (String) getProperties().get("RoutingScriptVersion");

+        try {

+			nexts = this.evaluateScript(scriptName, scriptVersion, itemSysKey).toString();

+		} catch (ScriptingEngineException e) {

+			Logger.error(e);

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

+		}

 

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

         String[] nextsTab = new String[tok.countTokens()];

@@ -41,14 +49,14 @@ public class XOrSplit extends Split
         }

 //        Logger.debug(0, getID()+" following "+nexts);

         if (nextsToFollow.size() != 1)

-            throw new ScriptingEngineException("not good number of active next");

+            throw new InvalidDataException("not good number of active next", null);

 

-        followNext((Next)nextsToFollow.get(0), agent);

+        followNext((Next)nextsToFollow.get(0), agent, itemSysKey);

 

     }

 

-    public void followNext(Next activeNext, AgentPath agent) throws ScriptingEngineException {

-        activeNext.getTerminusVertex().run(agent);

+    public void followNext(Next activeNext, AgentPath agent, int itemSysKey) throws InvalidDataException {

+        activeNext.getTerminusVertex().run(agent, itemSysKey);

     }

 

 }