[MMBASE SCM] r41030 - mmbase/trunk/core/src/main/java/org/mmbase/util

[michiel]

Author: michiel
Date: 2010-02-15 21:01:17 +0100 (Mon, 15 Feb 2010)
New Revision: 41030

Modified:
   mmbase/trunk/core/src/main/java/org/mmbase/util/FileWatcher.java
Log:
caching some errors in static init

Modified: mmbase/trunk/core/src/main/java/org/mmbase/util/FileWatcher.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/util/FileWatcher.java    
2010-02-15 20:00:54 UTC (rev 41029)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/FileWatcher.java    
2010-02-15 20:01:17 UTC (rev 41030)
@@ -89,22 +89,23 @@
      * @since MMBase-1.9.2
      */
     static void scheduleFileWatcherRunner() {
-        if (future != null) {
-            future.cancel(true);
-        }
-        future = 
org.mmbase.util.ThreadPools.scheduler.scheduleAtFixedRate(fileWatchers, 
THREAD_DELAY, THREAD_DELAY, TimeUnit.MILLISECONDS);
-        org.mmbase.util.ThreadPools.identify(future, "File Watcher");
-    }
-
-    static {
         try {
-            scheduleFileWatcherRunner();
+            if (future != null) {
+                future.cancel(true);
+            }
+            future = 
org.mmbase.util.ThreadPools.scheduler.scheduleAtFixedRate(fileWatchers, 
THREAD_DELAY, THREAD_DELAY, TimeUnit.MILLISECONDS);
+            org.mmbase.util.ThreadPools.identify(future, "File Watcher");
         } catch (Throwable t) {
             log.error(t);
         }
     }
 
+    static {
 
+        scheduleFileWatcherRunner();
+    }
+
+
     private static Map<String, String> props;
 
 
@@ -600,6 +601,7 @@
      * @since MMBase-1.8
      */
     private class FileSet extends AbstractSet<File> {
+
         public int size() {
             return FileWatcher.this.files.size();
         }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs