diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2013-02-07 12:35:06 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2013-02-07 12:35:06 +0000 |
| commit | 693f4fdc650d1a63747ac2ff8c7e01a22df38756 (patch) | |
| tree | dbe82513586e330f0f0f43fd1aa7fe2a9876ff33 /java | |
| parent | 22723f98a7d6e4c18b30537436c1c648dbcbe097 (diff) | |
| download | qpid-python-693f4fdc650d1a63747ac2ff8c7e01a22df38756.tar.gz | |
QPID-4570 : Multiple AMQP1-0 Connections cause error if JMX management is enabled
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1443442 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rwxr-xr-x | java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java | 2 | ||||
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java index 715a512b47..4dbb98cc4a 100755 --- a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java +++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java @@ -149,9 +149,9 @@ public class ProtocolEngine_1_0_0 implements ServerProtocolEngine, FrameOutputHa _conn = new ConnectionEndpoint(container, asSaslServerProvider(_appRegistry.getSubjectCreator( getLocalAddress()))); + _conn.setRemoteAddress(_network.getRemoteAddress()); _conn.setConnectionEventListener(new Connection_1_0(_appRegistry, _conn, _connectionId)); _conn.setFrameOutputHandler(this); - _conn.setRemoteAddress(_network.getRemoteAddress()); _frameWriter = new FrameWriter(_conn.getDescribedTypeRegistry()); _frameHandler = new FrameHandler(_conn); diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java index 634c5e6255..8e671a016f 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java +++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java @@ -165,8 +165,9 @@ public class ProtocolEngine_1_0_0_SASL implements ServerProtocolEngine, FrameOut _conn = new ConnectionEndpoint(container, asSaslServerProvider(ApplicationRegistry.getInstance() .getSubjectCreator(getLocalAddress()))); - _conn.setConnectionEventListener(new Connection_1_0(_appRegistry, _conn, _connectionId)); _conn.setRemoteAddress(getRemoteAddress()); + _conn.setConnectionEventListener(new Connection_1_0(_appRegistry, _conn, _connectionId)); + _conn.setFrameOutputHandler(this); @@ -374,11 +375,8 @@ public class ProtocolEngine_1_0_0_SASL implements ServerProtocolEngine, FrameOut FRAME_LOGGER.fine("SEND[" + getRemoteAddress() + "|" + amqFrame.getChannel() + "] : " + amqFrame.getFrameBody()); } - _frameWriter.setValue(amqFrame); - - ByteBuffer dup = ByteBuffer.allocate(_conn.getMaxFrameSize()); int size = _frameWriter.writeToBuffer(dup); |