qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1714441 - /qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
Date Sun, 15 Nov 2015 12:18:48 GMT
Author: kwall
Date: Sun Nov 15 12:18:48 2015
New Revision: 1714441

URL: http://svn.apache.org/viewvc?rev=1714441&view=rev
Log:
QPID-6850: [Java Broker] Have Connection_1_0#closed called as the underlying socket is closed

Modified:
    qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java

Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java?rev=1714441&r1=1714440&r2=1714441&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
(original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
Sun Nov 15 12:18:48 2015
@@ -127,7 +127,7 @@ public class AMQPConnection_1_0 extends
     private byte _major;
     private byte _minor;
     private byte _revision;
-    private Connection_1_0 _connection;
+    private final Connection_1_0 _connection;
     private volatile boolean _transportBlockedForWriting;
 
 
@@ -442,7 +442,6 @@ public class AMQPConnection_1_0 extends
         try
         {
             _endpoint.inputClosed();
-
         }
         catch(RuntimeException e)
         {
@@ -450,7 +449,14 @@ public class AMQPConnection_1_0 extends
         }
         finally
         {
-            markTransportClosed();
+            try
+            {
+                _connection.closed();
+            }
+            finally
+            {
+                markTransportClosed();
+            }
         }
     }
 



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


Mime
View raw message