Refactored exceptions to have single constructors and made room for wrapped causes.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@540165 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 12 insertions, 12 deletions

diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
index 2baaa344ef..a8a505294e 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
@@ -34,9 +34,8 @@ import org.apache.qpid.AMQException;
  */

 public class AMQConnectionWaitException extends AMQException

 {

-    public AMQConnectionWaitException(String s, Throwable e)

+    public AMQConnectionWaitException(String s, Throwable cause)

     {

-        super(s, e);

-

+        super(null, s, cause);

     }

 }

diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
index 951bd22df0..00f3ddc395 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
@@ -39,8 +39,9 @@ import org.apache.qpid.framing.AMQBody;
  */

 public class AMQUnexpectedBodyTypeException extends AMQException

 {

-    public AMQUnexpectedBodyTypeException(Class<? extends AMQBody> expectedClass, AMQBody body)

+    public AMQUnexpectedBodyTypeException(Class<? extends AMQBody> expectedClass, AMQBody body, Throwable cause)

     {

-        super("Unexpected body type.  Expected: " + expectedClass.getName() + "; got: " + body.getClass().getName());

+        super(null, "Unexpected body type.  Expected: " + expectedClass.getName() + "; got: " + body.getClass().getName(),

+            cause);

     }

 }

diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
index 4dd318f90d..11096ccf7e 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
@@ -38,8 +38,8 @@ import org.apache.qpid.AMQException;
  */

 public class AMQUnexpectedFrameTypeException extends AMQException

 {

-    public AMQUnexpectedFrameTypeException(String s)

+    public AMQUnexpectedFrameTypeException(String s, Throwable cause)

     {

-        super(s);

+        super(null, s, cause);

     }

 }

diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java
index ee5aa48db9..480a6f3603 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java
@@ -107,7 +107,7 @@ public class ClusteredProtocolHandler extends AMQPFastProtocolHandler implements
                 buffer(session, msg);
                 break;
             default:
-                throw new AMQException("Received message while in state: " + state);
+                throw new AMQException(null, "Received message while in state: " + state, null);
         }
         JoinState latest = _groupMgr.getState();
         if (!latest.equals(state))
diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
index 2f473b63fb..a9a7a55128 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
@@ -176,7 +176,7 @@ public class DefaultGroupManager implements GroupManager, MemberFailureListener,
         }
         catch (Exception e)
         {
-            throw new AMQException("Could not connect to leader: " + e, e);
+            throw new AMQException(null, "Could not connect to leader: " + e, e);
         }
     }
 
@@ -259,7 +259,7 @@ public class DefaultGroupManager implements GroupManager, MemberFailureListener,
         catch (Exception e)
         {
             e.printStackTrace();
-            throw new AMQException("Could not connect to prospect: " + e, e);
+            throw new AMQException(null, "Could not connect to prospect: " + e, e);
         }
     }
 
diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
index b01ec491ec..6529c7f3e2 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
@@ -207,7 +207,7 @@ public class MinaBrokerProxy extends Broker implements MethodHandler
         }
         else
         {
-            throw new AMQUnexpectedBodyTypeException(AMQMethodBody.class, body);
+            throw new AMQUnexpectedBodyTypeException(AMQMethodBody.class, body, null);
         }
     }
 
@@ -260,7 +260,7 @@ public class MinaBrokerProxy extends Broker implements MethodHandler
             }
             else
             {
-                throw new AMQUnexpectedFrameTypeException("Received message of unrecognised type: " + object);
+                throw new AMQUnexpectedFrameTypeException("Received message of unrecognised type: " + object, null);
             }
         }