Fix #229 - race cond. in PluginRegistry

HotswapProjects · Mar 15, 2018 · d8f0138 · d8f0138
1 parent efa5dae
commit d8f0138
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/hotswap-agent-core/src/main/java/org/hotswap/agent/config/PluginRegistry.java b/hotswap-agent-core/src/main/java/org/hotswap/agent/config/PluginRegistry.java
@@ -148,13 +148,12 @@ public Object initializePlugin(String pluginClass, ClassLoader appClassLoader) {
         }
 
         // already initialized in this or parent classloader
-        if (hasPlugin(clazz, appClassLoader, false)) {
+        if (doHasPlugin(clazz, appClassLoader, false, true)) {
             LOGGER.debug("Plugin {} already initialized in parent classloader of {}.", clazz, appClassLoader );
             return getPlugin(clazz, appClassLoader);
         }
 
-        Object pluginInstance = instantiate(clazz);
-        registeredPlugins.get(clazz).put(appClassLoader, pluginInstance);
+        Object pluginInstance = registeredPlugins.get(clazz).get(appClassLoader);
 
         if (annotationProcessor.processAnnotations(pluginInstance)) {
             LOGGER.info("Plugin '{}' initialized in ClassLoader '{}'.", pluginClass, appClassLoader);
@@ -208,6 +207,10 @@ public <T> T getPlugin(Class<T> pluginClass, ClassLoader classLoader) {
      * @return true/false
      */
     public boolean hasPlugin(Class<?> pluginClass, ClassLoader classLoader, boolean checkParent) {
+        return doHasPlugin(pluginClass, classLoader,checkParent, false);
+    }
+
+    public boolean doHasPlugin(Class<?> pluginClass, ClassLoader classLoader, boolean checkParent, boolean createIfMissing) {
         if (!registeredPlugins.containsKey(pluginClass))
             return false;
 
@@ -220,6 +223,10 @@ public boolean hasPlugin(Class<?> pluginClass, ClassLoader classLoader, boolean
                     return true;
                 }
             }
+            if (createIfMissing) {
+                Object pluginInstance = instantiate((Class<Object>) pluginClass);
+                pluginInstances.put(classLoader, pluginInstance);
+            }
         }
         return false;
     }