svn commit: r494655 - in /incubator/qpid/trunk/qpid/java: client/src/main/java/org/apache/qpid/client/ client/src/test/java/org/apache/qpid/test/unit/client/connection/ common/src/main/java/org/apache/qpid/

[rgreig]

Author: rgreig
Date: Tue Jan  9 15:46:48 2007
New Revision: 494655

URL: http://svn.apache.org/viewvc?view=rev&rev=494655
Log:
QPID-270 : (Patch supplied by Rob Godfrey) Change of use of 
AMQConnectionException

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
    
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?view=diff&rev=494655&r1=494654&r2=494655
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
 Tue Jan  9 15:46:48 2007
@@ -21,10 +21,7 @@
 package org.apache.qpid.client;
 
 import org.apache.log4j.Logger;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQUndeliveredException;
-import org.apache.qpid.AMQUnresolvedAddressException;
+import org.apache.qpid.*;
 import org.apache.qpid.client.failover.FailoverSupport;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.client.state.AMQState;
@@ -274,7 +271,7 @@
                 message = "Unable to Connect";
             }
 
-            AMQException e = new AMQConnectionException(message);
+            AMQException e = new AMQConnectionFailureException(message);
 
             if (lastException != null)
             {

Modified: 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?view=diff&rev=494655&r1=494654&r2=494655
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
 Tue Jan  9 15:46:48 2007
@@ -26,6 +26,7 @@
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQConnectionException;
 import org.apache.qpid.AMQUnresolvedAddressException;
+import org.apache.qpid.AMQConnectionFailureException;
 
 import javax.jms.Connection;
 
@@ -88,7 +89,7 @@
         }
         catch (AMQException amqe)
         {
-            if (!(amqe instanceof AMQConnectionException))
+            if (!(amqe instanceof AMQConnectionFailureException))
             {
                 fail("Correct exception not thrown. Excpected 
'AMQConnectionException' got: " + amqe);
             }

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java?view=diff&rev=494655&r1=494654&r2=494655
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
 Tue Jan  9 15:46:48 2007
@@ -21,10 +21,39 @@
 
 package org.apache.qpid;
 
+import org.apache.qpid.framing.AMQFrame;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.ConnectionCloseBody;
+
 public class AMQConnectionException extends AMQException
 {
-    public AMQConnectionException(String message)
+    private final int _classId;
+    private final int _methodId;
+    /* AMQP version for which exception ocurred */
+    private final byte major;
+    private final byte minor;
+
+    public AMQConnectionException(int errorCode, String msg, int classId, int 
methodId, byte major, byte minor, Throwable t)
     {
-        super(message);
+        super(errorCode, msg, t);
+        _classId = classId;
+        _methodId = methodId;
+        this.major = major;
+        this.minor = minor;
     }
+
+    public AMQConnectionException(int errorCode, String msg, int classId, int 
methodId, byte major, byte minor)
+    {
+        super(errorCode, msg);
+        _classId = classId;
+        _methodId = methodId;
+        this.major = major;
+        this.minor = minor;
+    }
+
+    public AMQFrame getCloseFrame(int channel)
+    {
+        return ConnectionCloseBody.createAMQFrame(channel, major, minor, 
_classId, _methodId, getErrorCode(), new AMQShortString(getMessage()));
+    }
+
 }