diff options
Diffstat (limited to 'java')
3 files changed, 10 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java index 1fe4ec792e..30d506a89b 100755 --- a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java +++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java @@ -58,8 +58,8 @@ public class ProtocolEngine_0_10 extends InputHandler implements ProtocolEngine _appRegistry = appRegistry; // FIXME Two log messages to maintain compatinbility with earlier protocol versions - CurrentActor.get().message(ConnectionMessages.OPEN(null, null, false, false)); - CurrentActor.get().message(ConnectionMessages.OPEN(null, "0-10", false, true)); + _connection.getLogActor().message(ConnectionMessages.OPEN(null, null, false, false)); + _connection.getLogActor().message(ConnectionMessages.OPEN(null, "0-10", false, true)); } public void setNetworkDriver(NetworkDriver driver) diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java index a1a7bd119b..e301996113 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java @@ -27,6 +27,7 @@ import java.text.MessageFormat; import org.apache.qpid.AMQException; import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.configuration.ConnectionConfig; +import org.apache.qpid.server.logging.LogActor; import org.apache.qpid.server.logging.LogSubject; import org.apache.qpid.server.logging.actors.CurrentActor; import org.apache.qpid.server.logging.actors.GenericActor; @@ -43,10 +44,11 @@ public class ServerConnection extends Connection implements AMQConnectionModel, { private ConnectionConfig _config; private Runnable _onOpenTask; + private LogActor _actor = GenericActor.getInstance(this); public ServerConnection() { - CurrentActor.set(GenericActor.getInstance(this)); + } @Override @@ -66,7 +68,7 @@ public class ServerConnection extends Connection implements AMQConnectionModel, { _onOpenTask.run(); } - CurrentActor.get().message(ConnectionMessages.OPEN(getClientId(), "0-10", true, true)); + _actor.message(ConnectionMessages.OPEN(getClientId(), "0-10", true, true)); } if (state == State.CLOSED) @@ -167,4 +169,8 @@ public class ServerConnection extends Connection implements AMQConnectionModel, } } + public LogActor getLogActor() + { + return _actor; + } } diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java index 4a304b3e66..a9b7d99503 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java @@ -114,7 +114,6 @@ public class ServerConnectionDelegate extends ServerDelegate else { sconn.invoke(new ConnectionOpenOk(Collections.emptyList())); - CurrentActor.set(GenericActor.getInstance(sconn)); sconn.setState(Connection.State.OPEN); } } |