Fixed recursion in rpc() call.

Fixed Permissions tests to clearup *before* running in case of previous failure.

Author: Steve Powell

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

@@ -28,9 +28,9 @@
 import com.rabbitmq.utility.BlockingValueOrException;
 
 /**
- * Base class modelling an AMQ channel. Subclasses implement close()
- * and processAsync(), and may choose to override
- * processShutdownSignal().
+ * Base class modelling an AMQ channel. Subclasses implement {@link #close()}
+ * and {@link #processAsync()}, and may choose to override
+ * {@link processShutdownSignal()} and {@link rpc()}.
  *
  * @see ChannelN
  * @see Connection
@@ -123,7 +123,7 @@ public AMQCommand exnWrappingRpc(Method m)
         throws IOException
     {
         try {
-            return rpc(m);
+            return privateRpc(m);
         } catch (AlreadyClosedException ace) {
             // Do not wrap it since it means that connection/channel
             // was closed in some action in the past
@@ -190,6 +190,12 @@ public void ensureIsOpen()
      */
     public AMQCommand rpc(Method m)
         throws IOException, ShutdownSignalException
+    {
+        return privateRpc(m);
+    }
+
+    private AMQCommand privateRpc(Method m)
+        throws IOException, ShutdownSignalException
     {
         SimpleBlockingRpcContinuation k = new SimpleBlockingRpcContinuation();
         rpc(m, k);

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

@@ -36,7 +36,7 @@
 public class Permissions extends BrokerTestCase
 {
 
-    protected Channel adminCh;
+    private Channel adminCh;
 
     public Permissions()
     {
@@ -50,6 +50,7 @@ public Permissions()
     protected void setUp()
         throws IOException
     {
+        deleteRestrictedAccount();
         addRestrictedAccount();
         super.setUp();
     }
@@ -74,11 +75,11 @@ protected void addRestrictedAccount()
     protected void deleteRestrictedAccount()
         throws IOException
     {
-        Host.rabbitmqctl("clear_permissions -p /test testadmin");
-        Host.rabbitmqctl("clear_permissions -p /test test");
-        Host.rabbitmqctl("delete_vhost /test");
-        Host.rabbitmqctl("delete_user testadmin");
-        Host.rabbitmqctl("delete_user test");
+        Host.rabbitmqctlIgnoreErrors("clear_permissions -p /test testadmin");
+        Host.rabbitmqctlIgnoreErrors("clear_permissions -p /test test");
+        Host.rabbitmqctlIgnoreErrors("delete_vhost /test");
+        Host.rabbitmqctlIgnoreErrors("delete_user testadmin");
+        Host.rabbitmqctlIgnoreErrors("delete_user test");
     }
 
     protected void createResources()
@@ -357,7 +358,7 @@ protected void runTest(boolean exp, String name, WithName test)
         }
     }
 
-    public interface WithName {
+    private interface WithName {
         public void with(String name) throws IOException;
     }
 

test/src/com/rabbitmq/tools/Host.java

@@ -36,8 +36,40 @@ private static String capture(InputStream is)
         return buff.toString();
     }
 
-    public static void executeCommand(String command)
-        throws IOException
+    public static void executeCommand(String command) throws IOException
+    {
+        Process pr = executeCommandProcess(command);
+        String stdout = capture(pr.getInputStream());
+        String stderr = capture(pr.getErrorStream());
+
+        int ev = waitForExitValue(pr);
+        if (ev != 0) {
+            throw new IOException("unexpected command exit value: " + ev +
+                                  "\nstdout:\n" + stdout +
+                                  "\nstderr:\n" + stderr + "\n");
+        }
+    }
+
+    private static int waitForExitValue(Process pr) {
+        while(true) {
+            try {
+                pr.waitFor();
+                break;
+            } catch (InterruptedException e) {}
+        }
+        return pr.exitValue();
+    }
+
+    public static void executeCommandIgnoringErrors(String command) throws IOException
+    {
+        Process pr = executeCommandProcess(command);
+//        String stdout = capture(pr.getInputStream());
+//        String stderr = capture(pr.getErrorStream());
+
+        waitForExitValue(pr);
+    }
+
+    private static Process executeCommandProcess(String command) throws IOException
     {
         String[] finalCommand;
         if (System.getProperty("os.name").toLowerCase().indexOf("windows") != -1) {
@@ -52,24 +84,14 @@ public static void executeCommand(String command)
             finalCommand[1] = "-c";
             finalCommand[2] = command;
         }
-        final Process pr = Runtime.getRuntime().exec(finalCommand);
-        final String stdout = capture(pr.getInputStream());
-        final String stderr = capture(pr.getErrorStream());
-        while(true) {
-            try {
-                pr.waitFor();
-                break;
-            } catch (InterruptedException e) {}
-        }
-        int ev = pr.exitValue();
-        if (ev != 0) {
-            throw new IOException("unexpected command exit value: " + ev +
-                                  "\nstdout:\n" + stdout +
-                                  "\nstderr:\n" + stderr + "\n");
-        }
+        return Runtime.getRuntime().exec(finalCommand);
     }
 
     public static void rabbitmqctl(String command) throws IOException {
         executeCommand("../rabbitmq-server/scripts/rabbitmqctl " + command);
     }
+
+    public static void rabbitmqctlIgnoreErrors(String command) throws IOException {
+        executeCommandIgnoringErrors("../rabbitmq-server/scripts/rabbitmqctl " + command);
+    }
 }