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

[1/2] activemq-artemis git commit: ARTEMIS-1719 fix ThreadLeakCheckRule after Netty upgrade

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a088abf9d -> 79ad9cb25


ARTEMIS-1719 fix ThreadLeakCheckRule after Netty upgrade


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

Branch: refs/heads/master
Commit: 44305694f7a5104497297b02a51caf5535a2e9bd
Parents: a088abf
Author: Justin Bertram <jb...@apache.org>
Authored: Mon Mar 5 21:11:51 2018 -0600
Committer: Justin Bertram <jb...@apache.org>
Committed: Mon Mar 5 21:12:55 2018 -0600

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/utils/ThreadLeakCheckRule.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/44305694/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ThreadLeakCheckRule.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ThreadLeakCheckRule.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ThreadLeakCheckRule.java
index 1778c7b..1401180 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ThreadLeakCheckRule.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ThreadLeakCheckRule.java
@@ -257,6 +257,9 @@ public class ThreadLeakCheckRule extends TestWatcher {
       } else if (threadName.contains("hawtdispatch") || (group != null && group.getName().contains("hawtdispatch"))) {
          // Static workers used by MQTT client.
          return true;
+      } else if (threadName.contains("ObjectCleanerThread")) {
+         // Required since upgrade to Netty 4.1.22 maybe because https://github.com/netty/netty/commit/739e70398ccb6b11ffa97c6b5f8d55e455a2165e
+         return true;
       } else {
          for (StackTraceElement element : thread.getStackTrace()) {
             if (element.getClassName().contains("org.jboss.byteman.agent.TransformListener")) {


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

Posted by mi...@apache.org.
This closes #1931


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

Branch: refs/heads/master
Commit: 79ad9cb254b896bfde3609980d8059b7d5cdfe63
Parents: a088abf 4430569
Author: Michael Andre Pearce <mi...@me.com>
Authored: Tue Mar 6 09:59:12 2018 +0000
Committer: Michael Andre Pearce <mi...@me.com>
Committed: Tue Mar 6 09:59:12 2018 +0000

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/utils/ThreadLeakCheckRule.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------