You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2017/04/28 09:15:57 UTC
[2/2] activemq-artemis git commit: ARTEMIS-1130 log disallowed SSL
protocols once
ARTEMIS-1130 log disallowed SSL protocols once
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3bd4bdb0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3bd4bdb0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3bd4bdb0
Branch: refs/heads/master
Commit: 3bd4bdb079626be72060410c6b0d02b39e32eb9b
Parents: c40f856
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Apr 25 14:38:23 2017 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Apr 28 10:15:42 2017 +0100
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyAcceptor.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3bd4bdb0/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
index a428f04..0f714c2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
@@ -34,6 +34,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
@@ -193,6 +194,8 @@ public class NettyAcceptor extends AbstractAcceptor {
private static final Logger logger = Logger.getLogger(NettyAcceptor.class);
+ final AtomicBoolean warningPrinted = new AtomicBoolean(false);
+
public NettyAcceptor(final String name,
final ClusterConnection clusterConnection,
final Map<String, Object> configuration,
@@ -473,12 +476,16 @@ public class NettyAcceptor extends AbstractAcceptor {
Set<String> set = new HashSet<>();
for (String s : protocols) {
if (s.equalsIgnoreCase("SSLv3") || s.equals("SSLv2Hello")) {
- ActiveMQServerLogger.LOGGER.disallowedProtocol(s, name);
+ if (!warningPrinted.get()) {
+ ActiveMQServerLogger.LOGGER.disallowedProtocol(s, name);
+ }
continue;
}
set.add(s);
}
+ warningPrinted.set(true);
+
engine.setEnabledProtocols(set.toArray(new String[set.size()]));
if (verifyHost) {