You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/11/17 15:49:11 UTC
[1/2] activemq-artemis git commit: NO-JIRA: change netty leak
detection override to only disable if not specified on command line
Repository: activemq-artemis
Updated Branches:
refs/heads/master 53b00e1dd -> e5f05a3a1
NO-JIRA: change netty leak detection override to only disable if not specified on command line
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/127ce3a8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/127ce3a8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/127ce3a8
Branch: refs/heads/master
Commit: 127ce3a84a99f4fcf95320de064e98d91e776e4c
Parents: 53b00e1
Author: Will Reichert <wi...@gmail.com>
Authored: Thu Nov 17 08:35:00 2016 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Nov 17 10:48:28 2016 -0500
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyAcceptor.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/127ce3a8/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 3fda5ce..aaae108 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
@@ -87,8 +87,10 @@ import org.jboss.logging.Logger;
public class NettyAcceptor extends AbstractAcceptor {
static {
- // Disable resource leak detection for performance reasons by default
- ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED);
+ // Disable default Netty leak detection if the Netty leak detection level system properties are not in use
+ if ( System.getProperty("io.netty.leakDetectionLevel") == null && System.getProperty("io.netty.leakDetection.level") == null) {
+ ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED);
+ }
}
//just for debug
[2/2] activemq-artemis git commit: This closes #890
Posted by cl...@apache.org.
This closes #890
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e5f05a3a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e5f05a3a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e5f05a3a
Branch: refs/heads/master
Commit: e5f05a3a11992b5fefb7c374c035c1f2950f99e4
Parents: 53b00e1 127ce3a
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Nov 17 10:48:49 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Nov 17 10:48:49 2016 -0500
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyAcceptor.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------