From db1c5322c699e04cc7083e4915231cbfec4cb290 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 16 Sep 2014 08:50:05 +0200
Subject: RemoveSlotFromCollection crashed if the currentChild parameter was
 not given

---
 .../lifecycle/instance/predefined/RemoveSlotFromCollection.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/com/c2kernel/lifecycle')

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, "");
         }
 
-- 
cgit v1.2.3