Merge pull request #245 from rabbitmq/rabbitmq-java-client-239

Replace AssertionErrors with RuntimeExceptions

Author: michaelklishin

src/main/java/com/rabbitmq/client/impl/AMQCommand.java

@@ -173,11 +173,11 @@ private static void checkEmptyFrameSize() {
         try {
             f.writeTo(new DataOutputStream(s));
         } catch (IOException ioe) {
-            throw new AssertionError("IOException while checking EMPTY_FRAME_SIZE");
+            throw new IllegalStateException("IOException while checking EMPTY_FRAME_SIZE");
         }
         int actualLength = s.toByteArray().length;
         if (EMPTY_FRAME_SIZE != actualLength) {
-            throw new AssertionError("Internal error: expected EMPTY_FRAME_SIZE("
+            throw new IllegalStateException("Internal error: expected EMPTY_FRAME_SIZE("
                     + EMPTY_FRAME_SIZE
                     + ") is not equal to computed value: " + actualLength);
         }

src/main/java/com/rabbitmq/client/impl/CommandAssembler.java

@@ -159,7 +159,7 @@ public synchronized boolean handleFrame(Frame f) throws IOException
           case EXPECTING_CONTENT_BODY:    consumeBodyFrame(f);   break;
 
           default:
-              throw new AssertionError("Bad Command State " + this.state);
+              throw new IllegalStateException("Bad Command State " + this.state);
         }
         return isComplete();
     }

src/main/java/com/rabbitmq/client/impl/nio/NioLoop.java

@@ -78,9 +78,6 @@ public void run() {
                                 state.getConnection().handleHeartbeatFailure();
                             } catch (Exception e) {
                                 LOGGER.warn("Error after heartbeat failure of connection {}", state.getConnection());
-                            } catch (AssertionError e) {
-                                // see https://github.com/rabbitmq/rabbitmq-java-client/issues/237
-                                LOGGER.warn("Assertion error after heartbeat failure of connection {}", state.getConnection());
                             } finally {
                                 selectionKey.cancel();
                             }
@@ -276,17 +273,7 @@ protected void dispatchIoErrorToConnection(final SocketChannelFrameHandlerState
         // In case of recovery after the shutdown,
         // the new connection shouldn't be initialized in
         // the NIO thread, to avoid a deadlock.
-        Runnable shutdown = new Runnable() {
-
-            @Override
-            public void run() {
-                try {
-                    state.getConnection().handleIoError(ex);
-                } catch(AssertionError e) {
-                    LOGGER.warn("Assertion error during error dispatching to connection: " + e.getMessage());
-                }
-            }
-        };
+        Runnable shutdown = () -> state.getConnection().handleIoError(ex);
         if (executorService() == null) {
             String name = "rabbitmq-connection-shutdown-" + state.getConnection();
             Thread shutdownThread = Environment.newThread(threadFactory(), shutdown, name);

src/main/java/com/rabbitmq/utility/BlockingCell.java

@@ -64,7 +64,7 @@ public synchronized T get(long timeout) throws InterruptedException, TimeoutExce
         if (timeout == INFINITY) return get();
 
         if (timeout < 0) {
-            throw new AssertionError("Timeout cannot be less than zero");
+            throw new IllegalArgumentException("Timeout cannot be less than zero");
         }
 
         long now = System.nanoTime() / NANOS_IN_MILLI;
@@ -133,12 +133,12 @@ public synchronized T uninterruptibleGet(int timeout) throws TimeoutException {
     }
 
     /**
-     * Store a value in this BlockingCell, throwing AssertionError if the cell already has a value.
+     * Store a value in this BlockingCell, throwing {@link IllegalStateException} if the cell already has a value.
      * @param newValue the new value to store
      */
     public synchronized void set(T newValue) {
         if (_filled) {
-            throw new AssertionError("BlockingCell can only be set once");
+            throw new IllegalStateException("BlockingCell can only be set once");
         }
         _value = newValue;
         _filled = true;

src/test/java/com/rabbitmq/client/test/BlockingCellTest.java

@@ -35,10 +35,10 @@ public void doubleSet() throws InterruptedException
         assertEquals("one", cell.get());
         try {
             cell.set("two");
-        } catch (AssertionError ae) {
+        } catch (IllegalStateException ae) {
             return;
         }
-        fail("Expected AssertionError");
+        fail("Expected IllegalStateException");
     }
 
     @Test public void multiGet()