Author: rgodfrey
Date: Fri Oct 31 20:17:17 2014
New Revision: 1635855
URL: http://svn.apache.org/r1635855
Log:
QPID-6206 : [Java Client] create new AMQDecoder for every reconnection attempt
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java?rev=1635855&r1=1635854&r2=1635855&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
Fri Oct 31 20:17:17 2014
@@ -143,7 +143,8 @@ public class AMQConnectionDelegate_8_0 i
_conn.getProtocolHandler().setNetworkConnection(network,
securityLayer.sender(network.getSender()));
StateWaiter waiter =
_conn.getProtocolHandler().createWaiter(openOrClosedStates);
- _conn.getProtocolHandler().getProtocolSession().init(settings);
+ _conn.getProtocolHandler().init(settings);
+
// this blocks until the connection has been set up or when an error
// has prevented the connection being set up
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=1635855&r1=1635854&r2=1635855&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Fri Oct 31 20:17:17 2014
@@ -66,6 +66,7 @@ import org.apache.qpid.protocol.AMQMetho
import org.apache.qpid.protocol.AMQMethodListener;
import org.apache.qpid.protocol.ProtocolEngine;
import org.apache.qpid.thread.Threading;
+import org.apache.qpid.transport.ConnectionSettings;
import org.apache.qpid.transport.Sender;
import org.apache.qpid.transport.TransportException;
import org.apache.qpid.transport.network.NetworkConnection;
@@ -194,7 +195,6 @@ public class AMQProtocolHandler implemen
_connection = con;
_protocolSession = new AMQProtocolSession(this, _connection);
_stateManager = new AMQStateManager(_protocolSession);
- _decoder = new ClientDecoder(_protocolSession.getMethodProcessor());
_failoverHandler = new FailoverHandler(this);
}
@@ -958,4 +958,10 @@ public class AMQProtocolHandler implemen
{
_decoder.setMaxFrameSize(frameMax == 0l || frameMax > (long)
Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) frameMax);
}
+
+ public void init(final ConnectionSettings settings)
+ {
+ _decoder = new ClientDecoder(_protocolSession.getMethodProcessor());
+ _protocolSession.init(settings);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
