1 files changed, 16 insertions, 25 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 e228688..061202d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
@@ -25,13 +25,12 @@ import java.util.Arrays;
 
 import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.CollectionMember;
-import com.c2kernel.collection.MembershipException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.InvalidData;
+import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.PersistencyException;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.ClusterStorageException;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.Logger;
 
@@ -56,10 +55,12 @@ public class RemoveSlotFromCollection extends PredefinedStep
      * 0 - collection name
      * 1 - slot number OR if null:
      * 2 - target entity key
+     * @throws ObjectNotFound 
+     * @throws PersistencyException 
      */
     @Override
 	protected String runActivityLogic(AgentPath agent, ItemPath item,
-			int transitionID, String requestData) throws InvalidDataException {
+			int transitionID, String requestData) throws InvalidData, ObjectNotFound, PersistencyException {
 
         String collName;
         int slotNo = -1;
@@ -75,35 +76,29 @@ public class RemoveSlotFromCollection extends PredefinedStep
             if (params.length>1 && params[1].length()>0) slotNo = Integer.parseInt(params[1]);
             if (params.length>2 && params[2].length()>0) currentChild = new ItemPath(params[2]);
         } catch (Exception e) {
-            throw new InvalidDataException("RemoveSlotFromCollection: Invalid parameters "+Arrays.toString(params), "");
+            throw new InvalidData("RemoveSlotFromCollection: Invalid parameters "+Arrays.toString(params));
         }
         
         if (slotNo == -1 && currentChild == null)
-        	throw new InvalidDataException("RemoveSlotFromCollection: Must give either slot number or entity key", "");
+        	throw new InvalidData("RemoveSlotFromCollection: Must give either slot number or entity key");
 
         // load collection
         try {
 			coll = (Collection<? extends CollectionMember>)Gateway.getStorage().get(item, ClusterStorage.COLLECTION+"/"+collName+"/last", null);
-		} catch (ObjectNotFoundException ex) {
-			throw new InvalidDataException("RemoveSlotFromCollection: Collection '"+collName+"' not found in this Item", "");
-		} catch (ClusterStorageException ex) {
+		} catch (PersistencyException ex) {
 			Logger.error(ex);
-			throw new InvalidDataException("RemoveSlotFromCollection: Error loading collection '\"+collName+\"': "+ex.getMessage(), "");
+			throw new PersistencyException("RemoveSlotFromCollection: Error loading collection '\"+collName+\"': "+ex.getMessage());
 		}
 
         // check the slot is there if it's given by id
         CollectionMember slot = null;
         if (slotNo > -1) {
-			try {
-				slot = coll.getMember(slotNo);
-			} catch (ObjectNotFoundException e) {
-				throw new InvalidDataException("RemoveSlotFromCollection: Slot "+slotNo+" not found in this collection", "");
-			}
+			slot = coll.getMember(slotNo);
         }
 
         // if both parameters are supplied, check the given item is actually in that slot
         if (slot != null && currentChild != null && !slot.getItemPath().equals(currentChild)) {
-        		throw new InvalidDataException("RemoveSlotFromCollection: Item "+currentChild+" was not in slot "+slotNo, "");
+        		throw new ObjectNotFound("RemoveSlotFromCollection: Item "+currentChild+" was not in slot "+slotNo);
         }
 
         if (slotNo == -1) { // find slot from entity key
@@ -115,22 +110,18 @@ public class RemoveSlotFromCollection extends PredefinedStep
             }
         }
         if (slotNo == -1) {
-            throw new InvalidDataException("No match", "");
+            throw new ObjectNotFound("Could not find "+currentChild+" in collection "+coll.getName());
         }
         
         // Remove the slot
-        try {
-			coll.removeMember(slotNo);
-		} catch (MembershipException e) {
-			throw new InvalidDataException(e.getMessage(), "");
-		}
+		coll.removeMember(slotNo);
 
         // Store the collection
 		try {
             Gateway.getStorage().put(item, coll, null);
-        } catch (ClusterStorageException e) {
+        } catch (PersistencyException e) {
             Logger.error(e);
-            throw new InvalidDataException("Error storing collection", "");
+            throw new PersistencyException("Error storing collection");
         }
 		
         return requestData;