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 2018/01/11 15:44:13 UTC

[1/2] activemq-artemis git commit: ARTEMIS-1598 modify SslHandler name in connector

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 629dd2c35 -> 499273bd6


ARTEMIS-1598 modify SslHandler name in connector

Use the same "name" when inserting the Netty SslHandler into the
pipeline for both acceptors and connectors.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/af1159a2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/af1159a2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/af1159a2

Branch: refs/heads/master
Commit: af1159a24b6ade4bfa3962dfc06940cefab6e4e3
Parents: 629dd2c
Author: Ulf Lilleengen <lu...@redhat.com>
Authored: Wed Jan 10 20:12:34 2018 +0100
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu Jan 11 09:41:23 2018 -0600

----------------------------------------------------------------------
 .../activemq/artemis/core/remoting/impl/netty/NettyConnector.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af1159a2/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 792c8aa..5874820 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -609,7 +609,7 @@ public class NettyConnector extends AbstractConnector {
 
                SslHandler handler = new SslHandler(engine);
 
-               pipeline.addLast(handler);
+               pipeline.addLast("ssl", handler);
             }
 
             if (httpEnabled) {


[2/2] activemq-artemis git commit: This closes #1768

Posted by jb...@apache.org.
This closes #1768


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/499273bd
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/499273bd
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/499273bd

Branch: refs/heads/master
Commit: 499273bd68d80d177a90c07e9ab739326b61daf0
Parents: 629dd2c af1159a
Author: Justin Bertram <jb...@apache.org>
Authored: Thu Jan 11 09:43:56 2018 -0600
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu Jan 11 09:43:56 2018 -0600

----------------------------------------------------------------------
 .../activemq/artemis/core/remoting/impl/netty/NettyConnector.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------