test fix

Author: vikinghawk

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

@@ -563,28 +563,22 @@ public void queueRecovered(String oldName, String newName) {
     @Test public void thatExcludedQueueDoesNotReappearOnRecover() throws IOException, InterruptedException {
         final String q = "java-client.test.recovery.excludedQueue1";
         channel.queueDeclare(q, true, false, false, null);
-        boolean deleted = false;
+        // now delete it using the delegate so AutorecoveringConnection and AutorecoveringChannel are not aware of it
+        ((AutorecoveringChannel)channel).getDelegate().queueDelete(q);
+        assertNotNull(((AutorecoveringConnection)connection).getRecordedQueues().get(q));
+        // exclude the queue from recovery
+        ((AutorecoveringConnection)connection).excludeQueueFromRecovery(q, true);
+        // verify its not there
+        assertNull(((AutorecoveringConnection)connection).getRecordedQueues().get(q));
+        // reconnect
+        closeAndWaitForRecovery();
+        expectChannelRecovery(channel);
+        // verify queue was not recreated
         try {
-            // now delete it using the delegate so AutorecoveringConnection and AutorecoveringChannel are not aware of it
-            ((AutorecoveringChannel)channel).getDelegate().queueDelete(q);
-            assertNotNull(((AutorecoveringConnection)connection).getRecordedQueues().get(q));
-            // exclude the queue from recovery
-            ((AutorecoveringConnection)connection).excludeQueueFromRecovery(q, true);
-            // verify its not there
-            assertNull(((AutorecoveringConnection)connection).getRecordedQueues().get(q));
-            // reconnect
-            closeAndWaitForRecovery();
-            expectChannelRecovery(channel);
-            // verify queue was not recreated
-            try {
-                channel.queueDeclarePassive(q);
-                fail("Expected passive declare to fail");
-            } catch (IOException ioe) {
-                // expected
-            }
-        } finally {
-            if (!deleted)
-                channel.queueDelete(q);
+            channel.queueDeclarePassive(q);
+            fail("Expected passive declare to fail");
+        } catch (IOException ioe) {
+            // expected
         }
     }