You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/10/22 22:10:03 UTC

svn commit: r1633706 - /qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java

Author: rgodfrey
Date: Wed Oct 22 20:10:02 2014
New Revision: 1633706

URL: http://svn.apache.org/r1633706
Log:
QPID-6125 : only send close frame if not already closing

Modified:
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1633706&r1=1633705&r2=1633706&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java Wed Oct 22 20:10:02 2014
@@ -853,20 +853,23 @@ public class AMQProtocolEngine implement
 
     private void closeConnection(int channelId, AMQFrame frame)
     {
-        try
-        {
-            markChannelAwaitingCloseOk(channelId);
-            closeSession();
-        }
-        finally
+        if(!_closing.get())
         {
             try
             {
-                writeFrame(frame);
+                markChannelAwaitingCloseOk(channelId);
+                closeSession();
             }
             finally
             {
-                closeProtocolSession();
+                try
+                {
+                    writeFrame(frame);
+                }
+                finally
+                {
+                    closeProtocolSession();
+                }
             }
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org