Repository: qpid-broker-j Updated Branches: refs/heads/6.0.x 569e15e61 -> d4ae88558
QPID-7743: [Java Broker] Propagate current IO thread when switching protocol engine (cherry picked from commit 0316f78ea009b175e96e80891d2184174a711dd7) 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/d4ae8855 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d4ae8855 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d4ae8855 Branch: refs/heads/6.0.x Commit: d4ae88558de125e87bea54946808ee272f841054 Parents: 569e15e Author: Lorenz Quack <[email protected]> Authored: Thu Apr 13 15:06:48 2017 +0000 Committer: Alex Rudyy <[email protected]> Committed: Tue Apr 25 13:04:41 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/d4ae8855/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 32a371b..8ae24a4 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 @@ -71,6 +71,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(); @@ -147,6 +148,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine @Override public void setIOThread(final Thread ioThread) { + _ioThread = ioThread; _delegate.setIOThread(ioThread); } @@ -517,6 +519,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]
