From fd8108209688cda9e782a4c3c91be522eb3ed1f4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 29 Oct 2013 16:21:08 +0100 Subject: Exception cleanup Allow versions to be null: use Integer or String --- .../java/com/c2kernel/lifecycle/instance/WfVertex.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/WfVertex.java') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/WfVertex.java b/src/main/java/com/c2kernel/lifecycle/instance/WfVertex.java index 9ed5c8a..de5f56f 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/WfVertex.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/WfVertex.java @@ -112,7 +112,7 @@ public abstract class WfVertex extends GraphableVertex */ public abstract Next addNext(WfVertex vertex); - protected Object evaluateScript(String scriptName, int scriptVersion, int itemSysKey) throws ScriptingEngineException + protected Object evaluateScript(String scriptName, Integer scriptVersion, int itemSysKey) throws ScriptingEngineException { try @@ -172,24 +172,18 @@ public abstract class WfVertex extends GraphableVertex } } - private static Script getScript(String name, int version) throws ScriptingEngineException + private static Script getScript(String name, Integer version) throws ScriptingEngineException { if (name == null || name.length() == 0) throw new ScriptingEngineException("Script name is empty"); Script script; - try - { + if (version!=null) { + Logger.debug(version.toString()); script = new Script(name, version); } - catch (NumberFormatException e) - { // version not valid + else { // empty version: try expression int split = name.indexOf(":"); - if (split > -1) - { - script = new Script(name.substring(0, split), name.substring(split + 1)); - } - else - throw new ScriptingEngineException("Script version is invalid"); + script = new Script(name.substring(0, split), name.substring(split + 1)); } return script; -- cgit v1.2.3