merge v1_5 into default

Author: tonyg

src/com/rabbitmq/client/ShutdownSignalException.java

@@ -66,6 +66,10 @@ public ShutdownSignalException(boolean hardError,
                                    boolean initiatedByApplication,
                                    Object reason, Object ref)
     {
+        super((initiatedByApplication
+               ? ("clean " + (hardError ? "connection" : "channel") + " shutdown")
+               : ((hardError ? "connection" : "channel") + " error"))
+              + "; reason: " + reason);
         this._hardError = hardError;
         this._initiatedByApplication = initiatedByApplication;
         this._reason = reason;
@@ -88,13 +92,6 @@ public ShutdownSignalException(boolean hardError,
     /** @return Reference to Connection or Channel object that fired the signal **/
     public Object getReference() { return _ref; }
 
-    public String toString() {
-        return super.toString() + " (" +
-            (_initiatedByApplication
-                    ? ("clean " + (_hardError ? "connection" : "channel") + " shutdown")
-             : ((_hardError ? "connection" : "channel") + " error"))
-            + "; reason: " + _reason + ")";
-    }
 }
 
 

test/src/com/rabbitmq/client/test/functional/BindingLifecycle.java

@@ -36,11 +36,18 @@
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.QueueingConsumer;
 
+import com.rabbitmq.tools.Host;
+
 import java.io.IOException;
 
 /**
  * This tests whether bindings are created and nuked properly.
  *
+ * The tests attempt to declare durable queues on a secondary node, if
+ * present, and that node is restarted as part of the tests while the
+ * primary node is still running. That way we exercise any node-down
+ * handler code in the server.
+ *
  * TODO: Adjust this test when Queue.Unbind is implemented in the
  * server
  */
@@ -55,27 +62,56 @@ public class BindingLifecycle extends PersisterRestartBase {
     protected static final String X = "X-" + System.currentTimeMillis();
     protected static final String K = "K-" + System.currentTimeMillis();
 
-    /**
-     * Create a durable queue on secondary node, if possible, falling
-     * back on the primary node if necessary.
-     */
-    @Override protected void declareDurableQueue(String q)
-        throws IOException
-    {
-        Connection connection;
-        try {
-            connection = connectionFactory.newConnection("localhost", 5673);
-        } catch (IOException e) {
-            super.declareDurableQueue(q);
-            return;
+    public Connection secondaryConnection;
+    public Channel secondaryChannel;
+
+    @Override public void openConnection() throws IOException {
+        super.openConnection();
+        if (secondaryConnection == null) {
+            try {
+                secondaryConnection = connectionFactory.newConnection("localhost", 5673);
+            } catch (IOException e) {
+                // just use a single node
+            }
         }
+    }
 
-        Channel channel = connection.createChannel();
+    @Override public void closeConnection() throws IOException {
+        if (secondaryConnection != null) {
+            secondaryConnection.abort();
+            secondaryConnection = null;
+        }
+        super.closeConnection();
+    }
 
-        channel.queueDeclare(q, true);
+    @Override public void openChannel() throws IOException {
+        if (secondaryConnection != null) {
+            secondaryChannel = secondaryConnection.createChannel();
+        }
+        super.openChannel();
+    }
+
+    @Override public void closeChannel() throws IOException {
+        if (secondaryChannel != null) {
+            secondaryChannel.abort();
+            secondaryChannel = null;
+        }
+        super.closeChannel();
+    }
+
+    @Override protected void restart() throws IOException {
+        if (secondaryConnection != null) {
+            secondaryConnection.abort();
+            secondaryConnection = null;
+            secondaryChannel = null;
+            Host.executeCommand("cd ../rabbitmq-test; make restart-secondary-node");
+        }
+        super.restart();
+    }
 
-        channel.abort();
-        connection.abort();
+    @Override protected void declareDurableQueue(String q) throws IOException {
+        (secondaryChannel == null ? channel : secondaryChannel).
+            queueDeclare(q, true);
     }
 
     /**

test/src/com/rabbitmq/client/test/functional/PersisterRestartBase.java

@@ -58,7 +58,7 @@ protected void restart()
         throws IOException
     {
         tearDown();
-        Host.executeCommand("cd ../rabbitmq-test; make restart-on-node");
+        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
         setUp();
     }