You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/03/10 06:58:59 UTC

[activemq] branch activemq-5.15.x updated: [AMQ-7301] Propagate the exception in order to close the connection cleanly

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new c1e2b30  [AMQ-7301] Propagate the exception in order to close the connection cleanly
c1e2b30 is described below

commit c1e2b3019c3e06cd537258851681ce183dba0147
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Mar 10 07:48:22 2020 +0100

    [AMQ-7301] Propagate the exception in order to close the connection cleanly
    
    (cherry picked from commit 08b389c2206f9b3f1a9afc86d6b6a3eab0535e08)
---
 .../activemq/transport/stomp/StompNIOSSLTransport.java     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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 beefa8f..cb199ae 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
@@ -57,15 +57,11 @@ public class StompNIOSSLTransport extends NIOSSLTransport {
     }
 
     @Override
-    protected void initializeStreams() {
-        try {
-            codec = new StompCodec(this);
-            super.initializeStreams();
-            if (inputBuffer.position() != 0 && inputBuffer.hasRemaining()) {
-                serviceRead();
-            }
-        } catch (IOException e) {
-            LOGGER.warn("Could not initialize connection from {}: {} ({})", socket.getInetAddress().getHostAddress(), e.getMessage(), e.getCause().getMessage());
+    protected void initializeStreams() throws IOException {
+        codec = new StompCodec(this);
+        super.initializeStreams();
+        if (inputBuffer.position() != 0 && inputBuffer.hasRemaining()) {
+            serviceRead();
         }
     }