commit 92120578d971f731dcdfd468abee4ae258c2c27e
author Jean-Baptiste Onofré <jbonofre@apache.org> Thu Jan 14 06:29:34 2021 +0100
committer GitHub <noreply@github.com> Thu Jan 14 06:29:34 2021 +0100
tree a77e85137808c7bed3abe39dc2e229beef2df3e4
parent 4dc6903c18d75ac72f33aba7ffbb35fb43effbec
parent 0c1b3e9240dbda0aee0426bfcef5e9cc628af7c7

Merge pull request #611 from jbonofre/AMQ-7444

[AMQ-7444] Fallback to remote location for remote address when socket has not been created yet

activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java

diff --git a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java
index cb199ae..d2e394b 100644
--- a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java
+++ b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java
@@ -49,14 +49,21 @@
         super(wireFormat, socket, null, null, null);
     }
 
-
-
     public StompNIOSSLTransport(WireFormat wireFormat, Socket socket,
             SSLEngine engine, InitBuffer initBuffer, ByteBuffer inputBuffer) throws IOException {
         super(wireFormat, socket, engine, initBuffer, inputBuffer);
     }
 
     @Override
+    public String getRemoteAddress() {
+        String remoteAddress = super.getRemoteAddress();
+        if (remoteAddress == null) {
+            return remoteLocation.toString();
+        }
+        return remoteAddress;
+    }
+
+    @Override
     protected void initializeStreams() throws IOException {
         codec = new StompCodec(this);
         super.initializeStreams();