qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject qpid-broker-j git commit: QPID-8137: [Broker-J] Return configured port as accepting port when network transport instance is not created
Date Mon, 19 Mar 2018 12:59:49 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master d189cc701 -> 43476a2a2


QPID-8137: [Broker-J] Return configured port as accepting port when network transport instance
is not created


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/43476a2a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/43476a2a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/43476a2a

Branch: refs/heads/master
Commit: 43476a2a2d510943a7f0eea4e464e7f018686e49
Parents: d189cc7
Author: Alex Rudyy <orudyy@apache.org>
Authored: Mon Mar 19 12:46:16 2018 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Mon Mar 19 12:59:44 2018 +0000

----------------------------------------------------------------------
 .../java/org/apache/qpid/server/transport/TCPandSSLTransport.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/43476a2a/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
index d3e14c0..f52d50d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
@@ -83,7 +83,8 @@ class TCPandSSLTransport implements AcceptingTransport
     @Override
     public int getAcceptingPort()
     {
-        return _networkTransport.getAcceptingPort();
+        NonBlockingNetworkTransport networkTransport = _networkTransport;
+        return networkTransport == null ? _port.getPort() : networkTransport.getAcceptingPort();
     }
 
     @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message