diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-09-26 11:06:51 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-09-26 11:06:51 +0200 |
| commit | be6b4608bdea970657d0257460ab92874314ca9b (patch) | |
| tree | 005aaee8a5c98eee2969e7f25a3d824e0ed9a725 /src/main/java/com/c2kernel/scripting/Script.java | |
| parent | d3de786f0e860f85ac1a00da0bc281aad14d953f (diff) | |
Various problems found by FindBugs
Diffstat (limited to 'src/main/java/com/c2kernel/scripting/Script.java')
| -rw-r--r-- | src/main/java/com/c2kernel/scripting/Script.java | 10 |
1 files changed, 9 insertions, 1 deletions
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
*
|