2 files changed, 6 insertions, 5 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 0b9be5951f..edbcef687a 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -1210,6 +1210,11 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
         return _username;
     }
 
+    public void setUsername(String id)
+    {
+        _username = id;
+    }
+    
     public String getPassword()
     {
         return _password;
@@ -1589,11 +1594,6 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
         return _syncPublish;
     }
 
-    public void setIdleTimeout(long l)
-    {
-        _delegate.setIdleTimeout(l);
-    }
-
     public int getNextChannelID()
     {
         return _sessions.getNextChannelId();
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index 9b5277257c..57a52ff0e2 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
@@ -173,6 +173,7 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Connec
             _qpidConnection.connect(brokerDetail.getHost(), brokerDetail.getPort(), _conn.getVirtualHost(),
                                     _conn.getUsername(), _conn.getPassword(), brokerDetail.useSSL(),saslMechs);
             _conn._connected = true;
+            _conn.setUsername(_qpidConnection.getUserID());
             _conn._failoverPolicy.attainedConnection();
         }
         catch(ProtocolVersionException pe)