Huge exception overhaul: Merged ClusterStorageException with

PersistencyException. Replaced MembershipException with
InvalidCollectionModification CORBA Exception. Made all predef steps
throw more accurate exceptions when they go wrong, and let more
exceptions bubble through from underneath.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/persistency/RemoteMap.java b/src/main/java/com/c2kernel/persistency/RemoteMap.java
index c11ceab..b1a1e51 100644
--- a/src/main/java/com/c2kernel/persistency/RemoteMap.java
+++ b/src/main/java/com/c2kernel/persistency/RemoteMap.java
@@ -27,7 +27,8 @@ import java.util.Iterator;
 import java.util.Set;

 import java.util.TreeMap;

 

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.PersistencyException;

 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.entity.proxy.MemberSubscription;

@@ -125,7 +126,7 @@ public class RemoteMap<V extends C2KLocalObject> extends TreeMap<String, V> impl
 			try {

 				keys = storage.getClusterContents(mItemPath, mPath+mName);

 				for (String key : keys) super.put(key, null);

-			} catch (ClusterStorageException e) {

+			} catch (PersistencyException e) {

 				Logger.error(e);

 			}

 

@@ -222,9 +223,9 @@ public class RemoteMap<V extends C2KLocalObject> extends TreeMap<String, V> impl
     				super.put(key, value);

     			}

     			return value;

-    		} catch (ClusterStorageException e) {

+    		} catch (PersistencyException e) {

     				Logger.error(e);

-    		} catch (ObjectNotFoundException e) {

+    		} catch (ObjectNotFound e) {

                 Logger.error(e);

             }

         }

@@ -261,7 +262,7 @@ public class RemoteMap<V extends C2KLocalObject> extends TreeMap<String, V> impl
                 storage.put(mItemPath, value, mLocker);

                 return putLocal(key, value);

             }

-		} catch (ClusterStorageException e) {

+		} catch (PersistencyException e) {

 			Logger.error(e);

 			return null;

 		}

@@ -282,7 +283,7 @@ public class RemoteMap<V extends C2KLocalObject> extends TreeMap<String, V> impl
 			    storage.remove(mItemPath, mPath+mName+"/"+key, mLocker);

 			    return super.remove(key);

             }

-		} catch (ClusterStorageException e) {

+		} catch (PersistencyException e) {

 			Logger.error(e);

 		}

 		return null;