Changeset 1909 for trunk

Timestamp:

2011-06-26 09:30:14 (11 months ago)

Author:

bruno

Message:

Add hack to stop the FilesystemAlterationMonitor?. Otherwise repeated stop/start of KauriRuntime? within one JVM has increasing number of these threads.

File:

• trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/KauriRuntime.java (modified) (3 diffs)

trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/KauriRuntime.java

@@ -18 +18 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.util.*;
@@ -43 +44 @@
 import org.kauriproject.util.io.IOUtils;
 import org.kauriproject.conf.Conf;
-import org.restlet.Context;
-import org.restlet.engine.component.ChildContext;
 
 /**
@@ -306 +305 @@
 
         // TODO temporarily disabled because FAM.stop() is slow
-        // See JCI jira patch: https://issues.apache.org/jira/browse/JCI-57
+        // See JCI jira patch: https://issues.apache.org/jira/browse/JCI-57 (the newer one in commons-io has the same problem)
         // fam.stop();
+        // Added the following workaround:
+        if (System.getSecurityManager() == null) {
+            try {
+                Field famRunningField = fam.getClass().getDeclaredField("running");
+                famRunningField.setAccessible(true);
+                Field threadField = fam.getClass().getDeclaredField("thread");
+                threadField.setAccessible(true);
+                Thread famThread = (Thread)threadField.get(fam);
+                famRunningField.setBoolean(fam, false);
+                famThread.interrupt();
+                fam.stop();
+            } catch (Exception e) {
+                infolog.error("Error stopping FilesystemAlterationMonitor", e);
+            }
+        } else {
+            infolog.warn("Unable to stop the FilesystemAlterationMonitor using workaround since a security manager is installed.");
+        }
 
         // In case starting the runtime failed, modules might be null