1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/c2kernel/utils/ActDefCache.java b/src/main/java/com/c2kernel/utils/ActDefCache.java
index ec98c93..da171da 100644
--- a/src/main/java/com/c2kernel/utils/ActDefCache.java
+++ b/src/main/java/com/c2kernel/utils/ActDefCache.java
@@ -23,12 +23,12 @@
  */
 package com.c2kernel.utils;
 
-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.entity.proxy.ItemProxy;
 import com.c2kernel.lifecycle.ActivityDef;
 import com.c2kernel.persistency.ClusterStorage;
-import com.c2kernel.persistency.ClusterStorageException;
 import com.c2kernel.persistency.outcome.Viewpoint;
 import com.c2kernel.process.Gateway;
 
@@ -41,23 +41,23 @@ public class ActDefCache extends DescriptionObjectCache<ActivityDef> {
 	}
 	
 	@Override
-	public ActivityDef loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFoundException, InvalidDataException {
+	public ActivityDef loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFound, InvalidData {
 		ActivityDef thisActDef;
         String actType = proxy.getProperty("Complexity");
         Viewpoint actView = (Viewpoint)proxy.getObject(ClusterStorage.VIEWPOINT + "/" + actType + "ActivityDef/" + version);
         String marshalledAct;
 		try {
 			marshalledAct = actView.getOutcome().getData();
-		} catch (ClusterStorageException ex) {
+		} catch (PersistencyException ex) {
 			Logger.error(ex);
-			throw new ObjectNotFoundException("Problem loading "+name+" v"+version+": "+ex.getMessage(), "");
+			throw new ObjectNotFound("Problem loading "+name+" v"+version+": "+ex.getMessage());
 		}
 		try {
 			thisActDef = (ActivityDef)Gateway.getMarshaller().unmarshall(marshalledAct);
 			thisActDef.getProperties().put("Version", version);
 		} catch (Exception ex) {
 			Logger.error(ex);
-			throw new InvalidDataException("Could not unmarshall '"+name+"' v"+version+": "+ex.getMessage(), "");
+			throw new InvalidData("Could not unmarshall '"+name+"' v"+version+": "+ex.getMessage());
 		}
         thisActDef.setName(name);
         thisActDef.setVersion(version);