Bugzilla Bug 698885 - Race conditions during IPA installation

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1983 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 7 insertions, 2 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
index 38a135310..a424d8b73 100644
--- a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
+++ b/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
@@ -145,7 +145,7 @@ public class PluginRegistry implements IPluginRegistry {
         }
         PluginInfo info = new PluginInfo(name, desc, classpath);
 
-        addPluginInfo(type, id, info);
+        addPluginInfo(type, id, info, 0);
     }
 
     public void removePluginInfo(String type, String id)
@@ -160,6 +160,11 @@ public class PluginRegistry implements IPluginRegistry {
 
     public void addPluginInfo(String type, String id, IPluginInfo info)
         throws ERegistryException {
+        addPluginInfo(type, id, info, 1);
+    }
+
+    public void addPluginInfo(String type, String id, IPluginInfo info, int saveConfig)
+        throws ERegistryException {
         Hashtable plugins = (Hashtable) mTypes.get(type); 
 
         if (plugins == null) {
@@ -174,7 +179,7 @@ public class PluginRegistry implements IPluginRegistry {
         plugins.put(id, info);
 
         // rebuild configuration store
-        rebuildConfigStore(locale);
+        if (saveConfig == 1) rebuildConfigStore(locale);
     }
 
     public void rebuildConfigStore(Locale locale)