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

diff --git a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java b/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
index d3eb5ec..88a060d 100644
--- a/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
+++ b/src/main/java/com/c2kernel/utils/DescriptionObjectCache.java
@@ -23,8 +23,8 @@
  */

 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.entity.proxy.ProxyObserver;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.entity.proxy.MemberSubscription;

@@ -35,7 +35,7 @@ public abstract class DescriptionObjectCache<D extends DescriptionObject> {
 

 	SoftCache<String, CacheEntry<D>> cache = new SoftCache<String, CacheEntry<D>>();

 

-	public D get(String name, int version) throws ObjectNotFoundException, InvalidDataException {

+	public D get(String name, int version) throws ObjectNotFound, InvalidData {

 		D thisDef;

 		synchronized(cache) {

 			CacheEntry<D> thisDefEntry = cache.get(name+"_"+version);

@@ -55,7 +55,7 @@ public abstract class DescriptionObjectCache<D extends DescriptionObject> {
 	

 	public abstract String getDefRoot();

 	

-	public abstract D loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFoundException, InvalidDataException;

+	public abstract D loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFound, InvalidData;

 

 	public void removeObject(String id) {

 		synchronized(cache) {