Repository: qpid-broker-j Updated Branches: refs/heads/6.1.x a5d55b134 -> 8a3931d7f
QPID-7743: [Java Broker] Propagate current IO thread when switching protocol engine Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/8a3931d7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/8a3931d7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/8a3931d7 Branch: refs/heads/6.1.x Commit: 8a3931d7f6cb1eafbc5740b2073dd9777314c9e9 Parents: a5d55b1 Author: Lorenz Quack <[email protected]> Authored: Thu Apr 13 15:06:48 2017 +0000 Committer: Alex Rudyy <[email protected]> Committed: Tue Apr 25 12:59:42 2017 +0100 ---------------------------------------------------------------------- .../apache/qpid/server/transport/MultiVersionProtocolEngine.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8a3931d7/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java index bce128d..b704df8 100755 --- a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java +++ b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java @@ -69,6 +69,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine private final Protocol _defaultSupportedReply; private volatile ProtocolEngine _delegate = new SelfDelegateProtocolEngine(); + private volatile Thread _ioThread; private final AtomicReference<Action<ProtocolEngine>> _workListener = new AtomicReference<>(); private final AggregateTicker _aggregateTicker = new AggregateTicker(); @@ -145,6 +146,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine @Override public void setIOThread(final Thread ioThread) { + _ioThread = ioThread; _delegate.setIOThread(ioThread); } @@ -515,6 +517,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine newDelegate.notifyWork(); } _delegate = newDelegate; + _delegate.setIOThread(_ioThread); _delegate.setWorkListener(_workListener.get()); _header.flip(); _delegate.received(_header); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
