diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-09-16 08:50:05 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-09-16 08:50:05 +0200 |
| commit | db1c5322c699e04cc7083e4915231cbfec4cb290 (patch) | |
| tree | eddb142f17b937c7d52c67867ab6fcd12d8f219c | |
| parent | 5e294dbd586034b23484adb3c0c4de0f6acd901c (diff) | |
RemoveSlotFromCollection crashed if the currentChild parameter was not
given
| -rw-r--r-- | src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java index 726078b..7caad61 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java @@ -94,7 +94,7 @@ public class RemoveSlotFromCollection extends PredefinedStep }
// if both parameters are supplied, check the given item is actually in that slot
- if (slot != null && !slot.getItemPath().equals(currentChild)) {
+ if (slot != null && currentChild != null && !slot.getItemPath().equals(currentChild)) {
throw new InvalidDataException("RemoveSlotFromCollection: Item "+currentChild+" was not in slot "+slotNo, "");
}
|
