>From 3fc3baa07ab1e299f02ba859d82487fdb414de98 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Thu, 18 Oct 2012 01:20:46 -0400 Subject: [PATCH] Reorder VLV indexing for clones to avoid errors --- .../src/com/netscape/cms/servlet/csadmin/DatabasePanel.java | 7 +++---- .../src/com/netscape/cms/servlet/csadmin/SystemConfigService.java | 8 ++++---- 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 89f01e01ccc20cd580406435312e22e061d9ab5c..1c0e32e82f0f1e5fbe00b889df19a8bcd01b3100 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 3bbe3ca8099f0e722271e9bf7ae21812bffb5404..4410373752595e75b9b6e86c490537aa66249877 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java @@ -385,14 +385,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); } -- 1.7.11.4