From da731d2bb81666b9c697d9099da632e7dfcdc0f7 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 9 Sep 2014 12:13:21 +0200 Subject: Replaced int sysKey Item identifier with UUID, which is now portable. ItemPath objects are now used to identify Items throughout the kernel, replacing ints and Integers. --- src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java b/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java index b9fc263..305ec34 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/OrSplit.java @@ -4,6 +4,7 @@ import java.util.StringTokenizer; import com.c2kernel.common.InvalidDataException; import com.c2kernel.graph.model.DirectedEdge; import com.c2kernel.lookup.AgentPath; +import com.c2kernel.lookup.ItemPath; import com.c2kernel.scripting.ScriptingEngineException; import com.c2kernel.utils.Logger; /** @@ -20,13 +21,13 @@ public class OrSplit extends Split super(); } @Override - public void runNext(AgentPath agent, int itemSysKey) throws InvalidDataException + public void runNext(AgentPath agent, ItemPath itemPath) throws InvalidDataException { String nexts; String scriptName = (String) getProperties().get("RoutingScriptName"); Integer scriptVersion = getVersionNumberProperty("RoutingScriptVersion"); try { - nexts = this.evaluateScript(scriptName, scriptVersion, itemSysKey).toString(); + nexts = this.evaluateScript(scriptName, scriptVersion, itemPath).toString(); } catch (ScriptingEngineException e) { Logger.error(e); throw new InvalidDataException("Error running routing script "+scriptName+" v"+scriptVersion, null); @@ -48,7 +49,7 @@ public class OrSplit extends Split if (thisNext != null && thisNext.equals(nextEdge.getProperties().get("Alias"))) { WfVertex term = nextEdge.getTerminusVertex(); - term.run(agent, itemSysKey); + term.run(agent, itemPath); Logger.msg(7, "Running " + nextEdge.getProperties().get("Alias")); active++; } -- cgit v1.2.3