1 files changed, 29 insertions, 25 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index b7253e6e9c..7976760696 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -20,36 +20,27 @@
  */
 package org.apache.qpid.client.protocol;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.jms.JMSException;
 import javax.security.sasl.SaslClient;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.ConnectionTuneParameters;
-import org.apache.qpid.client.handler.ClientMethodDispatcherImpl;
 import org.apache.qpid.client.message.UnprocessedMessage;
 import org.apache.qpid.client.message.UnprocessedMessage_0_8;
 import org.apache.qpid.client.state.AMQStateManager;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.HeartbeatBody;
-import org.apache.qpid.framing.MethodDispatcher;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolInitiation;
-import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.client.state.AMQState;
+import org.apache.qpid.framing.*;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
 import org.apache.qpid.transport.Sender;
-import org.apache.qpid.transport.TransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.qpid.client.handler.ClientMethodDispatcherImpl;
 
 /**
  * Wrapper for protocol session that provides type-safe access to session attributes. <p/> The underlying protocol
@@ -157,6 +148,16 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession
         return getAMQConnection().getVirtualHost();
     }
 
+    public String getUsername()
+    {
+        return getAMQConnection().getUsername();
+    }
+
+    public String getPassword()
+    {
+        return getAMQConnection().getPassword();
+    }
+
     public SaslClient getSaslClient()
     {
         return _saslClient;
@@ -298,11 +299,22 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession
         return _connection.getSession(channelId);
     }
 
+    /**
+     * Convenience method that writes a frame to the protocol session. Equivalent to calling
+     * getProtocolSession().write().
+     *
+     * @param frame the frame to write
+     */
     public void writeFrame(AMQDataBlock frame)
     {
         _protocolHandler.writeFrame(frame);
     }
 
+    public void writeFrame(AMQDataBlock frame, boolean wait)
+    {
+        _protocolHandler.writeFrame(frame, wait);
+    }
+
     /**
      * Starts the process of closing a session
      *
@@ -363,15 +375,7 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession
 
     public void closeProtocolSession() throws AMQException
     {
-        try
-        {
-            _protocolHandler.getNetworkConnection().close();
-        }
-        catch(TransportException e)
-        {
-            //ignore such exceptions, they were already logged
-            //and this is a forcible close.
-        }
+        _protocolHandler.closeConnection(0);
     }
 
     public void failover(String host, int port)