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 | b677a248ab115537e54ec472acea471c4c580a02 (patch) | |
| tree | 460167432b95481af9563a52127424b0063dd7ea | |
| parent | fdc92ab7edb2d516a5b1abeab0e1deac274c5d9e (diff) | |
| download | qpid-python-b677a248ab115537e54ec472acea471c4c580a02.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@1443442 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 3 insertions, 5 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java index 715a512b47..4dbb98cc4a 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java +++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java index 634c5e6255..8e671a016f 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java +++ b/qpid/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); |