You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2016/02/18 16:31:22 UTC

mina-sshd git commit: Revert "[SSHD-646] ThreadGroup created in ThreadUtils is not destroyed and causes memory leak"

Repository: mina-sshd
Updated Branches:
  refs/heads/master fd2a22f58 -> ab8c836fa


Revert "[SSHD-646] ThreadGroup created in ThreadUtils is not destroyed and causes memory leak"

This reverts commit 7e24f2e1b59f9b3bf026ac3c08f7a0a7baa97a74.


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/ab8c836f
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/ab8c836f
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/ab8c836f

Branch: refs/heads/master
Commit: ab8c836fa7ad7b0cb92edbe989744359b3acdb3e
Parents: fd2a22f
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Thu Feb 18 17:31:59 2016 +0200
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Thu Feb 18 17:31:59 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/sshd/common/util/threads/ThreadUtils.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ab8c836f/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java
index 5fc07be..d0a25ed 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java
@@ -166,9 +166,6 @@ public final class ThreadUtils {
             ThreadGroup parentGroup = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
             String effectiveName = name.replace(' ', '-');
             group = new ThreadGroup(parentGroup, "sshd-" + effectiveName + "-group");
-            if (!group.isDaemon()) {
-                group.setDaemon(true);  // automatically destroy when last thread dies
-            }
             namePrefix = "sshd-" + effectiveName + "-thread-";
         }
 
@@ -183,5 +180,7 @@ public final class ThreadUtils {
             }
             return t;
         }
+
     }
+
 }