Stopped the broker closing the ProtocolSessions as this was causing the client to lock in Mina seemingly missing the notify for the CloseFuture and hangs indefinately

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@687741 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index 64914b407d..aec032bb54 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
@@ -230,7 +230,8 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, Managable
                     _logger.info("Channel[" + channelId + "] awaiting closure. Should close socket as client did not close-ok :" + frame);
                 }
 
-                closeProtocolSession();
+
+//                closeProtocolSession();
                 return;
             }
         }
@@ -272,7 +273,7 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, Managable
         }
         catch (AMQException e)
         {
-            _logger.error("Received incorrect protocol initiation", e);
+            _logger.info("Received incorrect protocol initiation:" + e.getMessage());
 
             _minaProtocolSession.write(new ProtocolInitiation(ProtocolVersion.getLatestSupportedVersion()));
 
@@ -356,7 +357,7 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, Managable
 
             _logger.error("Unexpected exception while processing frame.  Closing connection.", e);
 
-            closeProtocolSession();
+//            closeProtocolSession();
         }
     }
 
@@ -655,9 +656,9 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, Managable
 
     public void closeProtocolSession(boolean waitLast)
     {
-        _logger.debug("Waiting for last write to join.");
         if (waitLast && (_lastWriteFuture != null))
         {
+            _logger.debug("Waiting for last write to join.");
             _lastWriteFuture.join(LAST_WRITE_FUTURE_JOIN_TIMEOUT);
         }