Merge bug16247 into default

Author: tonyg

src/com/rabbitmq/client/AlreadyClosedException.java

@@ -5,8 +5,8 @@
  * which was already closed
  */
 public class AlreadyClosedException extends ShutdownSignalException {
-	public AlreadyClosedException(String s)
+	public AlreadyClosedException(String s, Object ref)
 	{
-		super(true, true, s);
+		super(true, true, s, ref);
 	}
 }

src/com/rabbitmq/client/RpcClient.java

@@ -190,7 +190,8 @@ public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message)
             ShutdownSignalException wrapper =
                 new ShutdownSignalException(sig.isHardError(),
                                             sig.isInitiatedByApplication(),
-                                            sig.getReason());
+                                            sig.getReason(),
+                                            sig.getReference());
             wrapper.initCause(sig);
             throw wrapper;
         } else {

src/com/rabbitmq/client/ShutdownSignalException.java

@@ -26,6 +26,10 @@
 
 /**
  * Encapsulates a shutdown condition for a connection to an AMQP broker.
+ * Depending on HardError when calling
+ * {@link com.rabbitmq.client.ShutdownSignalException#getReference()} we will
+ * either get a reference to the Connection or Channel instance that fired
+ * this exception.
  */
 
 public class ShutdownSignalException extends RuntimeException {
@@ -42,19 +46,25 @@ public class ShutdownSignalException extends RuntimeException {
     /** Possible explanation */
     private final Object _reason;
 
+    /** Either Channel or Connection instance, depending on _hardError */
+    private final Object _ref;
+
     /**
      * Construct a ShutdownSignalException from the arguments.
      * @param hardError the relevant hard error
      * @param initiatedByApplication if the shutdown was client-initiated
      * @param reason Object describing the origin of the exception
+     * @param ref Reference to Connection or Channel that fired the signal
      */
     public ShutdownSignalException(boolean hardError,   
                                    boolean initiatedByApplication,
-                                   Object reason)
+                                   Object reason, Object ref)
     {
         this._hardError = hardError;
         this._initiatedByApplication = initiatedByApplication;
         this._reason = reason;
+        // Depending on hardError what we got is either Connection or Channel reference
+        this._ref = ref;
     }
 
     /** @return true if this signals a connection error, or false if a channel error */
@@ -68,6 +78,9 @@ public ShutdownSignalException(boolean hardError,
 
     /** @return the reason object, if any */
     public Object getReason() { return _reason; }
+    
+    /** @return Reference to Connection or Channel object that fired the signal **/
+    public Object getReference() { return _ref; }
 
     public String toString() {
         return super.toString() + " (" +

src/com/rabbitmq/client/impl/AMQChannel.java

@@ -173,7 +173,7 @@ public void ensureIsOpen()
         throws AlreadyClosedException
     {
         if (!isOpen()) {
-            throw new AlreadyClosedException("Attempt to use closed channel");
+            throw new AlreadyClosedException("Attempt to use closed channel", this);
         }
     }
 

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -107,7 +107,7 @@ public void ensureIsOpen()
         throws AlreadyClosedException
     {
         if (!isOpen()) {
-            throw new AlreadyClosedException("Attempt to use closed connection");
+            throw new AlreadyClosedException("Attempt to use closed connection", this);
         }
     }
 
@@ -565,7 +565,7 @@ public void shutdown(Object reason,
             ensureIsOpen(); // invariant: we should never be shut down more than once per instance
             _shutdownCause = new ShutdownSignalException(true,
                                                          initiatedByApplication,
-                                                         reason);
+                                                         reason, this);
         }
         if (cause != null) {
             _shutdownCause.initCause(cause);
@@ -611,4 +611,4 @@ public void close(int closeCode,
     @Override public String toString() {
         return "amqp://" + _params.getUserName() + "@" + getHost() + ":" + getPort() + _params.getVirtualHost();
     }
-}
+}

src/com/rabbitmq/client/impl/ChannelN.java

@@ -222,7 +222,8 @@ public void releaseChannelNumber() {
                 releaseChannelNumber();
                 ShutdownSignalException signal = new ShutdownSignalException(false,
                                                                              false,
-                                                                             command);
+                                                                             command,
+                                                                             this);
                 processShutdownSignal(signal);
                 notifyListeners();
                 return true;
@@ -274,13 +275,13 @@ public void close(int closeCode,
         Channel.Close reason = new Channel.Close(closeCode, closeMessage, 0, 0);
         ShutdownSignalException signal = new ShutdownSignalException(false,
                                                                      initiatedByApplication,
-                                                                     reason);
+                                                                     reason,
+                                                                     this);
         if (cause != null) {
             signal.initCause(cause);
         }
-
         processShutdownSignal(signal);
-        
+
         // Now that we're in quiescing state, send channel.close and
         // wait for the reply. Note that we can't use regular old rpc
         // or exnWrappingRpc here, since _isOpen is false. We use