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

diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyMessage.java b/src/main/java/com/c2kernel/entity/proxy/ProxyMessage.java
index 5aabf7e..fc69992 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyMessage.java
+++ b/src/main/java/com/c2kernel/entity/proxy/ProxyMessage.java
@@ -23,7 +23,7 @@ package com.c2kernel.entity.proxy;
 import java.io.IOException;

 import java.net.DatagramPacket;

 

-import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.InvalidData;

 import com.c2kernel.lookup.InvalidItemPathException;

 import com.c2kernel.lookup.ItemPath;

 

@@ -65,17 +65,17 @@ public class ProxyMessage {
         setState(state);

     }

 

-    public ProxyMessage(String line) throws InvalidDataException, IOException {

+    public ProxyMessage(String line) throws InvalidData, IOException {

         if (line == null)

             throw new IOException("Null proxy message");

         String[] tok = line.split(":");

         if (tok.length != 2)

-            throw new InvalidDataException("String '"+line+"' does not constitute a valid proxy message.", "");

+            throw new InvalidData("String '"+line+"' does not constitute a valid proxy message.");

         if (tok[0].length() > 0 && !tok[0].equals("tree")) {

         	try {

 				itemPath = new ItemPath(tok[0]);

 			} catch (InvalidItemPathException e) {

-				throw new InvalidDataException("Item in proxy message "+line+" was not valid");

+				throw new InvalidData("Item in proxy message "+line+" was not valid");

 			}

         }

         path = tok[1];

@@ -85,7 +85,7 @@ public class ProxyMessage {
         }

     }

 

-    public ProxyMessage(DatagramPacket packet) throws InvalidDataException, IOException {

+    public ProxyMessage(DatagramPacket packet) throws InvalidData, IOException {

         this(new String(packet.getData()));

     }