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, 3 insertions, 3 deletions

diff --git a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java b/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java
index 60e5233..5e063ed 100644
--- a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java
+++ b/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java
@@ -23,7 +23,7 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;

 import java.util.StringTokenizer;

 

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.utils.Logger;

 

@@ -70,7 +70,7 @@ public class MemberSubscription<C extends C2KLocalObject> implements Runnable {
                     newMember = (C)subject.getObject(interest+"/"+newChild);

                     contents.remove(newChild);

                     observer.add(newMember);

-                } catch (ObjectNotFoundException ex) {

+                } catch (ObjectNotFound ex) {

                     observer.control(ERROR, "Listed member "+newChild+" was not found.");

                 } catch (ClassCastException ex) {

                 	Logger.error(ex);

@@ -117,7 +117,7 @@ public class MemberSubscription<C extends C2KLocalObject> implements Runnable {
                     Logger.msg(4, "Adding "+path);

                     contents.add(name);

                     observer.add(newMember);

-                } catch (ObjectNotFoundException e) {

+                } catch (ObjectNotFound e) {

                     Logger.error("Member Subscription: could not load "+path);

                     Logger.error(e);

                 }