changed qpid session propagation

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

2 files changed, 9 insertions, 11 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index 42d67b0cd3..93a12b602b 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
@@ -47,12 +47,10 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate
     {
         _conn.checkNotClosed();
         int channelId = _conn._idFactory.incrementAndGet();
-        AMQSession session =
-                new AMQSession_0_10(_conn, channelId, transacted, acknowledgeMode, prefetchHigh, prefetchLow);
+        AMQSession session;
         try
-        {
-            // create the qpid session with an expiry  <= 0 so that the session does not expire
-            _qpidConnection.createSession(0);
+        {         
+            session = new AMQSession_0_10(_qpidConnection, _conn, channelId, transacted, acknowledgeMode, prefetchHigh, prefetchLow);
             _conn.registerSession(channelId, session);
             if (_conn._started)
             {
@@ -98,8 +96,8 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate
      */
     public void resubscribeSessions() throws JMSException, AMQException, FailoverException
     {
-       //NOT implemented as railover is handled at a lower level
-       throw new FailoverException("failing to reconnect during failover, operation not supported.");
+        //NOT implemented as railover is handled at a lower level
+        throw new FailoverException("failing to reconnect during failover, operation not supported.");
     }
 
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index aaa724fd93..c14b10903c 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -80,7 +80,7 @@ public class AMQSession_0_10 extends AMQSession
      * @param defaultPrefetchHighMark The maximum number of messages to prefetched before suspending the session.
      * @param defaultPrefetchLowMark  The number of prefetched messages at which to resume the session.
      */
-    AMQSession_0_10(AMQConnection con, int channelId, boolean transacted, int acknowledgeMode,
+    AMQSession_0_10( org.apache.qpidity.client.Connection qpidConnection, AMQConnection con, int channelId, boolean transacted, int acknowledgeMode,
                     MessageFactoryRegistry messageFactoryRegistry, int defaultPrefetchHighMark,
                     int defaultPrefetchLowMark)
     {
@@ -88,7 +88,7 @@ public class AMQSession_0_10 extends AMQSession
         super(con, channelId, transacted, acknowledgeMode, messageFactoryRegistry, defaultPrefetchHighMark,
               defaultPrefetchLowMark);
         // create the qpid session with an expiry  <= 0 so that the session does not expire
-        _qpidSession = null; // todo when the connection is finalized _connection.getQpidConnection().createSession(0);
+        _qpidSession =  qpidConnection.createSession(0);
         // set the exception listnere for this session
         _qpidSession.setExceptionListener(new QpidSessionExceptionListener());
         // set transacted if required
@@ -108,11 +108,11 @@ public class AMQSession_0_10 extends AMQSession
      * @param defaultPrefetchHigh The maximum number of messages to prefetched before suspending the session.
      * @param defaultPrefetchLow  The number of prefetched messages at which to resume the session.
      */
-    AMQSession_0_10(AMQConnection con, int channelId, boolean transacted, int acknowledgeMode, int defaultPrefetchHigh,
+    AMQSession_0_10(org.apache.qpidity.client.Connection qpidConnection, AMQConnection con, int channelId, boolean transacted, int acknowledgeMode, int defaultPrefetchHigh,
                     int defaultPrefetchLow)
     {
 
-        this(con, channelId, transacted, acknowledgeMode, MessageFactoryRegistry.newDefaultRegistry(),
+        this(qpidConnection, con, channelId, transacted, acknowledgeMode, MessageFactoryRegistry.newDefaultRegistry(),
              defaultPrefetchHigh, defaultPrefetchLow);
     }