commit 9fe911a9576ac69b64b1d4322ceae8cd1f3cfbec
author Alex Rudyy <orudyy@apache.org> Mon Jul 09 23:55:14 2018 +0100
committer Alex Rudyy <orudyy@apache.org> Mon Jul 09 23:55:14 2018 +0100
tree aa9c2ba4c6992174b9ae51a83568668ebfeaa6c3
parent 7f67f82ec04a8a346cc64ec1cd824022c9082da1

QPID-8212: Improve handling of received method frames

client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java

diff --git a/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 3986bb3..13c122f 100644
--- a/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -482,15 +482,13 @@
     @Override
     public void methodFrameReceived(final int channel, final AMQMethodBody amqMethodBody) throws QpidException
     {
-        if ( channel == 0
-             || !isClosedForInput(channel)
-             || (isClosing(channel) && (amqMethodBody instanceof ChannelCloseBody || amqMethodBody instanceof ChannelCloseOkBody)))
+        try
         {
             _protocolHandler.methodBodyReceived(channel, amqMethodBody);
         }
-        else
+        catch (IllegalStateException e)
         {
-            _logger.debug("Ignoring method {} as channel {} closed on {}", amqMethodBody, channel);
+            throw new QpidException("Unexpected exception on receiving method " + amqMethodBody, e);
         }
     }