MONDRIAN: Refactors the DynamicContentFinder to use a simple java.uti…

…l.Timer isntead of a thread pool. Also modifies the return type of DynamicContentFinder.reloadDatasources() to void.

[git-p4: depot-paths = "//open/mondrian/": change = 14743]

src/main/mondrian/server/DynamicContentFinder.java

@@ -19,7 +19,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.*;
+import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * Implementation of
@@ -45,12 +46,7 @@ public class DynamicContentFinder
     private static final Logger LOGGER =
         Logger.getLogger(MondrianServer.class);
 
-    private final static ScheduledExecutorService executorService =
-        Util.getScheduledExecutorService(
-            1,
-            "mondrian.server.DynamicContentFinder$executorService");
-
-    private final ScheduledFuture<?> scheduledTask;
+    private final Timer timer;
 
     /**
      * Creates a DynamicContentFinder.
@@ -61,51 +57,45 @@ public DynamicContentFinder(
     {
         super(dataSourcesConfigUrl);
         reloadDataSources();
-        scheduledTask = executorService.scheduleWithFixedDelay(
-            new Runnable() {
+        timer = new Timer(
+            "mondrian.server.DynamicContentFinder$timer",
+            true);
+        timer.scheduleAtFixedRate(
+            new TimerTask() {
                 public void run() {
-                    Object result;
-                    try {
-                        result = reloadDataSources();
-                    } catch (Throwable e) {
-                        result = e;
-                    }
-                    Util.discard(result); // for debug
+                    reloadDataSources();
                 }
             },
-            0,
             MondrianProperties.instance().XmlaSchemaRefreshInterval.get(),
-            TimeUnit.MILLISECONDS);
+            MondrianProperties.instance().XmlaSchemaRefreshInterval.get());
     }
 
     /**
      * Cleans up all background updating jobs.
      */
     public void shutdown() {
-        scheduledTask.cancel(true);
+        super.shutdown();
+        timer.cancel();
     }
 
     /**
      * Checks for updates to datasources content, flushes obsolete catalogs.
-     *
-     * @return Whether anything changed
      */
-    public synchronized boolean reloadDataSources() {
+    public synchronized void reloadDataSources() {
         try {
             String dataSourcesConfigString = getContent();
             if (!hasDataSourcesContentChanged(dataSourcesConfigString)) {
-                return false;
+                return;
             }
             DataSourcesConfig.DataSources newDataSources =
                 XmlaSupport.parseDataSources(
                     dataSourcesConfigString, LOGGER);
             if (newDataSources == null) {
-                return false;
+                return;
             }
             flushObsoleteCatalogs(newDataSources);
             this.dataSources = newDataSources;
             this.lastDataSourcesConfigString = dataSourcesConfigString;
-            return true;
         } catch (Exception e) {
             throw Util.newError(
                 e,

testsrc/main/mondrian/xmla/impl/DynamicDatasourceXmlaServletTest.java

@@ -233,7 +233,7 @@ public void testReloadDataSources() throws Exception {
         out.write(ds2.toXML().getBytes());
         out.close();
 
-        final boolean b1 = finder.reloadDataSources();
+        finder.reloadDataSources();
         assertTrue(
             finder.containsCatalog(DATASOURCE_1_NAME, CATALOG_1_NAME));
         assertTrue(
@@ -245,7 +245,7 @@ public void testReloadDataSources() throws Exception {
         out.write(ds1.toXML().getBytes());
         out.flush();
 
-        final boolean b2 = finder.reloadDataSources();
+        finder.reloadDataSources();
         assertTrue(
             finder.containsCatalog(DATASOURCE_1_NAME, CATALOG_0_NAME));
         assertTrue(
@@ -277,7 +277,7 @@ public void testAutoReloadDataSources() throws Exception {
         out.write(ds2.toXML().getBytes());
         out.close();
 
-        final boolean b = finder.reloadDataSources();
+        finder.reloadDataSources();
         assertTrue(
             finder.containsCatalog(DATASOURCE_1_NAME, CATALOG_1_NAME));
         assertTrue(