From be6b4608bdea970657d0257460ab92874314ca9b Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 26 Sep 2014 11:06:51 +0200 Subject: Various problems found by FindBugs --- src/main/java/com/c2kernel/scripting/Script.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/c2kernel/scripting/Script.java') diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/com/c2kernel/scripting/Script.java index d8ccee2..2709a13 100644 --- a/src/main/java/com/c2kernel/scripting/Script.java +++ b/src/main/java/com/c2kernel/scripting/Script.java @@ -124,7 +124,7 @@ public class Script public Script(ItemProxy object, AgentProxy subject, Job job) throws ScriptingEngineException { - this(job.getActPropString("ScriptName"), job.getActPropString("ScriptVersion") == null ? null : Integer.parseInt(job.getActPropString("ScriptVersion").toString())); + this(job.getActPropString("ScriptName"), getScriptVersion(job)); // set environment - this needs to be well documented for script developers if (!mInputParams.containsKey("item")) addInputParam("item", ItemProxy.class); @@ -142,6 +142,14 @@ public class Script addOutput("errors", ErrorInfo.class); } + public static int getScriptVersion(Job job) { + String verStr = job.getActPropString("ScriptVersion"); + if (verStr != null) + return Integer.parseInt(verStr); + else + return -1; + } + /** * For consoles * -- cgit v1.2.3