Merge bug22968 into default.

Author: Simon MacMullen

test/src/com/rabbitmq/client/test/server/Permissions.java

@@ -52,7 +52,6 @@ public class Permissions extends BrokerTestCase
 {
 
     protected Channel adminCh;
-    protected Connection noAccessConn;
     protected Channel noAccessCh;
 
     public Permissions()
@@ -128,8 +127,7 @@ public void with(String name) throws IOException {
         factory.setUsername("noaccess");
         factory.setPassword("test");
         factory.setVirtualHost("/test");
-        noAccessConn = factory.newConnection();
-        noAccessCh = noAccessConn.createChannel();
+        noAccessCh = factory.newConnection().createChannel();
     }
 
     protected void releaseResources()
@@ -141,6 +139,7 @@ public void with(String name) throws IOException {
                     adminCh.exchangeDelete(name);
                 }});
         adminCh.getConnection().abort();
+        noAccessCh.getConnection().abort();
     }
 
     protected void withNames(WithName action)
@@ -321,8 +320,15 @@ protected void expectExceptionRun(int exceptionCode, WithName action)
             action.with("");
             fail();
         } catch (IOException e) {
-            noAccessCh = noAccessConn.createChannel();
-            checkShutdownSignal(exceptionCode, e);
+            ShutdownSignalException sse = (ShutdownSignalException)e.getCause();
+            if (sse.isHardError()) {
+                fail("Got a hard-error.  Was expecting soft-error: " + exceptionCode);
+            } else {
+                AMQP.Channel.Close closeMethod =
+                    (AMQP.Channel.Close) ((Command)sse.getReason()).getMethod();
+                assertEquals(exceptionCode, closeMethod.getReplyCode());
+            }
+            noAccessCh = noAccessCh.getConnection().createChannel();
         }
     }