Merge branch '4.0.x-stable'

michaelklishin · michaelklishin · commit e517e4c1da88 · 2017-01-16T17:47:42.000+03:00
diff --git a/src/main/java/com/rabbitmq/client/impl/nio/NioLoop.java b/src/main/java/com/rabbitmq/client/impl/nio/NioLoop.java
@@ -78,6 +78,9 @@ 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();
                             }
