From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:30:41 +0200
Subject: 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.

---
 src/main/java/com/c2kernel/entity/proxy/ProxyManager.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/c2kernel/entity/proxy/ProxyManager.java')

diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java b/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
index aa38ea8..8824951 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
+++ b/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
@@ -25,8 +25,8 @@ import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.InvalidData;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.DomainPath;
 import com.c2kernel.lookup.ItemPath;
@@ -103,7 +103,7 @@ public class ProxyManager
         }
     }
 
-    protected void processMessage(ProxyMessage thisMessage) throws InvalidDataException {
+    protected void processMessage(ProxyMessage thisMessage) throws InvalidData {
         if (Logger.doLog(9)) Logger.msg(9, thisMessage.toString());
 
         if (thisMessage.getPath().equals(ProxyMessage.PINGPATH)) // ping response
@@ -166,7 +166,7 @@ public class ProxyManager
     **************************************************************************/
     private ItemProxy createProxy( org.omg.CORBA.Object ior,
                                               ItemPath itemPath)
-        throws ObjectNotFoundException
+        throws ObjectNotFound
     {
 
         ItemProxy newProxy = null;
@@ -201,7 +201,7 @@ public class ProxyManager
     **************************************************************************/
     private ItemProxy getProxy( org.omg.CORBA.Object ior,
     							            ItemPath itemPath)
-        throws ObjectNotFoundException
+        throws ObjectNotFound
     {
 
         synchronized(proxyPool) {
@@ -224,7 +224,7 @@ public class ProxyManager
     * Proxy from Alias
     **************************************************************************/
     public ItemProxy getProxy( Path path )
-        throws ObjectNotFoundException
+        throws ObjectNotFound
     {
     	ItemPath itemPath;
     	if (path instanceof ItemPath) itemPath = (ItemPath)path;
@@ -236,7 +236,7 @@ public class ProxyManager
     }
     
     public AgentProxy getAgentProxy( AgentPath path )
-    	throws ObjectNotFoundException
+    	throws ObjectNotFound
     {
     	return (AgentProxy) getProxy(path);
     }
-- 
cgit v1.2.3