Changeset 5847

Timestamp:

Feb 27, 2020, 9:34:25 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1226: More thread deadlocks

I hope this can fix the deadlock.

File:

• extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Reggie.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Reggie.java

@@ -494 +494 @@
   public static XmlConfig reloadConfig()
   {
-    synchronized (configLock)
-    {
-      loadConfig(true);
-      ActivityLog.getInstance().reloadConfig();
-      CounterService.getInstance().reloadConfig();
-    }
+    loadConfig(true);
+    ActivityLog.getInstance().reloadConfig();
+    CounterService.getInstance().reloadConfig();
     return rootConfig;
   }
@@ -641 +638 @@
         }
         
+      }
+      catch (Exception ex)
+      {
+        logger.error("Could not load configuration", ex);
+        throw new RuntimeException(ex);
+      }
+      finally
+      {
+        FileUtil.close(is);
+      }
+    }
+    
+    if (reloadConfig == null)
+    {
+      // Create and register an event handler that re-load the Reggie configuration
+      // whenever a SERVICE_STARTED event is sent for the Open Grid Service
+      Registry registry = Application.getExtensionsManager().getRegistry();
+      synchronized (registry)
+      {
         if (reloadConfig == null)
         {
-          // Create and register an event handler that re-load the Reggie configuration
-          // whenever a SERVICE_STARTED event is sent for the Open Grid Service
-          Registry registry = Application.getExtensionsManager().getRegistry();
           reloadConfig = new ReloadConfigEventHandler();
           EventFilter whenOpenGridServiceStarted = new ExtensionEventFilter("net.sf.basedb.opengrid.service", Services.SERVICE_STARTED);
           registry.registerEventHandler(reloadConfig, whenOpenGridServiceStarted, Reggie.class.getClassLoader());
         }
-        
-      }
-      catch (Exception ex)
-      {
-        logger.error("Could not load configuration", ex);
-        throw new RuntimeException(ex);
-      }
-      finally
-      {
-        FileUtil.close(is);
       }
     }