From f857a84d4676eb10d4116d9f2ffd80e943d59ff1 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 07 Jan 2008 17:35:17 +0000
Subject: [PATCH] Fix for 2647
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
index f2ec21f..19e58bb 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
@@ -75,6 +75,7 @@
private Installation installation;
private File backupDir;
private UserInteraction ui;
+ private boolean isSchemaCustomized;
/**
* Creates a new parameterized instance.
@@ -111,6 +112,7 @@
* the diff operation
*/
public void calculateSchemaCustomizations() throws ApplicationException {
+ isSchemaCustomized = false;
if (installation.getStatus().schemaHasBeenModified()) {
LOG.log(Level.INFO, "Schema contains customizations that will " +
"be migrated");
@@ -118,6 +120,7 @@
ldifDiff(installation.getBaseSchemaFile(),
installation.getSchemaConcatFile(),
getCustomSchemaDiffFile());
+ isSchemaCustomized = true;
} catch (ApplicationException ae) {
throw ae;
} catch (Exception e) {
@@ -268,7 +271,7 @@
* @return boolean where true indicates schema customization
*/
public boolean isSchemaCustomized() {
- return installation.getStatus().schemaHasBeenModified();
+ return isSchemaCustomized;
}
/**
--
Gitblit v1.10.0