summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-08-25 13:53:33 +0200
committerAndrew Branson <andrew.branson@cern.ch>2014-08-25 13:53:33 +0200
commitf7df981d031e360b379b86d9aefdde15b918b21f (patch)
tree44f08a278514dee9be01ffba67da8db85547d907 /src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
parentbdb708127a7f0e1ef065a49377341843e12672cb (diff)
Require integers for all resource versions
Diffstat (limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java')
-rw-r--r--src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
index 77a3aa5..b80b3cd 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
@@ -63,6 +63,7 @@ public class CreateItemFromDescription extends PredefinedStep
CompositeActivityDef wfDef;
String wfDefName = null;
String wfDefVer = null;
+
if (input.length > 2) // override wf
wfDefName = input[2];
@@ -108,11 +109,13 @@ public class CreateItemFromDescription extends PredefinedStep
throw new InvalidDataException("No workflow def version given","");
try {
- wfDef = (CompositeActivityDef)LocalObjectLoader.getActDef(wfDefName, wfDefVer);
+ wfDef = (CompositeActivityDef)LocalObjectLoader.getActDef(wfDefName, Integer.valueOf(wfDefVer));
} catch (ObjectNotFoundException ex) {
- throw new InvalidDataException("Workflow def '"+wfDefName+"' v"+wfDefVer+" item not found", "");
+ throw new InvalidDataException("Workflow def '"+wfDefName+"' v"+wfDefVer+" not found", "");
} catch (ClassCastException ex) {
throw new InvalidDataException("Activity def '"+wfDefName+"' v"+wfDefVer+" was not Composite", "");
+ } catch (NumberFormatException ex) {
+ throw new InvalidDataException("Workflow def version '"+wfDefVer+"' given for def '"+wfDefName+"' was not an integer", "");
}