summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-10-18 01:20:46 -0400
committerEndi Sukma Dewata <edewata@vm-117.idm.lab.bos.redhat.com>2012-10-18 11:44:33 -0400
commit5a32e25f217eb17cae046d92cec7a32d5f9abb66 (patch)
tree2d7985b808c436d15b7ac29c2132f7575c40f783
parent99f6c95fd9d754e10fa1f2fa87f54503b45a3e3d (diff)
downloadpki-alee-73.zip
pki-alee-73.tar.gz
pki-alee-73.tar.xz
Reorder VLV indexing for clones to avoid errorsalee-73
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java7
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java8
2 files changed, 7 insertions, 8 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
index 89f01e0..1c0e32e 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
@@ -483,15 +483,14 @@ public class DatabasePanel extends WizardPanelBase {
cs.putString("preop.internaldb.replicationpwd", replicationpwd);
cs.putString("preop.database.removeData", "false");
- ConfigurationUtils.reInitSubsystem(csType);
- ConfigurationUtils.populateIndexes();
-
if (select.equals("clone")) {
CMS.debug("Start setting up replication.");
ConfigurationUtils.setupReplication();
- ConfigurationUtils.reInitSubsystem(csType);
}
+ ConfigurationUtils.reInitSubsystem(csType);
+ ConfigurationUtils.populateIndexes();
+
cs.putBoolean("preop.Database.done", true);
cs.commit(false);
} catch (Exception e) {
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
index 8bc3c59..e61d113 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
@@ -380,14 +380,14 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
cs.putString("preop.database.removeData", "false");
cs.commit(false);
- ConfigurationUtils.reInitSubsystem(csType);
- ConfigurationUtils.populateIndexes();
-
if (data.getIsClone().equals("true")) {
CMS.debug("Start setting up replication.");
ConfigurationUtils.setupReplication();
- ConfigurationUtils.reInitSubsystem(csType);
}
+
+ ConfigurationUtils.reInitSubsystem(csType);
+ ConfigurationUtils.populateIndexes();
+
} catch (Exception e) {
throw new PKIException("Error in populating database" + e);
}