Repository: activemq Updated Branches: refs/heads/activemq-5.15.x eca72dc81 -> ca86e2fbe
AMQ-6801: ensure transport listener is set before tripping latch to indicate startup is occuring (cherry picked from commit 2e492569db2345cf3be8532630f93219159a8b15) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ca86e2fb Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ca86e2fb Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ca86e2fb Branch: refs/heads/activemq-5.15.x Commit: ca86e2fbe6ff1cba762993c09de443a36c3709e7 Parents: eca72dc Author: Robbie Gemmell <rob...@apache.org> Authored: Fri Sep 1 13:00:35 2017 +0100 Committer: Robbie Gemmell <rob...@apache.org> Committed: Fri Sep 1 13:02:39 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/activemq/transport/ws/WSTransportProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ca86e2fb/activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportProxy.java ---------------------------------------------------------------------- diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportProxy.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportProxy.java index d5a5207..e1a2f90 100644 --- a/activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportProxy.java +++ b/activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportProxy.java @@ -149,9 +149,9 @@ public final class WSTransportProxy extends TransportSupport implements Transpor @Override protected void doStart() throws Exception { + transport.setTransportListener(getTransportListener()); socketTransportStarted.countDown(); - transport.setTransportListener(getTransportListener()); transport.start(); }
