X-Git-Url: http://git.megacz.com/?p=org.ibex.jinetd.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjinetd%2FLoader.java;h=012a9356b5179016d1988df2be6f1e02b210a797;hp=96093bd5e35621476b634f826f99ea6bae462014;hb=70604175e53b4c6ca71a82108f35e74b1ac1993a;hpb=99f8fd894be14226a64f1889657edf863edf8afb

diff --git a/src/org/ibex/jinetd/Loader.java b/src/org/ibex/jinetd/Loader.java
index 96093bd..012a935 100644
--- a/src/org/ibex/jinetd/Loader.java
+++ b/src/org/ibex/jinetd/Loader.java
@@ -1,4 +1,9 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.jinetd;
+import org.ibex.io.*;
 import org.ibex.util.*;
 import java.io.*;
 import java.util.*;
@@ -59,7 +64,7 @@ public class Loader extends Watcher {
     public String getClassPath() {
         String classpath = System.getProperty("java.class.path");
         String [] l = new File(Root.root + "/LIB/").list();
-        for(int i=0; i<l.length; i++) {
+        for(int i=0; l != null && i<l.length; i++) {
             if (!l[i].endsWith(".jar")) continue;
             classpath += File.pathSeparatorChar;
             classpath += Root.root + "/LIB/" + l[i];
@@ -147,15 +152,36 @@ public class Loader extends Watcher {
                 path.endsWith(".jar") ) ? super.slash(path) : null; }
 
 
+    private void nuke() {
+        if (tg.activeCount() == 0) return;
+        Log.info(this, "killing all threads for: " + path);
+        Log.info(this, "   thread count before interrupt: " + tg.activeCount());
+        tg.interrupt();
+        try { Thread.sleep(3000); } catch (Exception e) { Log.error(this, e); }
+        Log.info(this, "   thread count before kill: " + tg.activeCount());
+        Thread[] all = new Thread[tg.activeCount()];
+        tg.enumerate(all, true);
+        for(int i=0; i<all.length; i++) Stream.kill(all[i]);
+        try { Thread.sleep(3000); } catch (Exception e) { Log.error(this, e); }
+        Log.info(this, "   thread count after kill: " + tg.activeCount());
+        if (tg.activeCount() > 0) {
+            Log.warn(this, "    annoying threads:");
+            Thread[] annoying = new Thread[tg.activeCount()];
+            tg.enumerate(annoying, true);
+            for(int i=0; i<annoying.length; i++) {
+                Log.warn(this, "      " + annoying[i]);
+                StackTraceElement[] stack = annoying[i].getStackTrace();
+                for(int j=0; j<stack.length; j++) Log.warn(this, "        " + stack[j]);
+                Log.warn(this, " ");
+            }
+        }
+    }
+
     // dump the classloader if anything changes
     public void changed(Watched w) {
         if (w.path.indexOf("BIN") != -1) return;
         if (classloader != null) {
-            Log.info(this, "killing all threads for: " + w.path);
-            Log.info(this, "   thread count before kill: " + tg.activeCount());
-            tg.interrupt();
-            try { Thread.sleep(1000); } catch (Exception e) { }
-            Log.info(this, "   thread count after kill: " + tg.activeCount());
+            for(int i=0; i<3; i++) nuke();
             tg = new ThreadGroup(getAbsolutePath());
             Log.info(this, "scheduling classes for reload due to change in: " + w.path);
             classloader = null;