From e0dcbe0d17e7fccc9741dd4bdb1252c2c885aad8 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Mon, 04 May 2009 12:46:36 +0000
Subject: [PATCH] Fix for issue #3965 (revert should not be supported from 2.0 to a previous version)
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeIssueNotifier.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeIssueNotifier.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeIssueNotifier.java
index 526cb64..c3bf5e9 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeIssueNotifier.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeIssueNotifier.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -179,16 +179,25 @@
// If the import/export effect is present, append the detailed
// instructions.
if (effects.contains(Effect.UPGRADE_DATA_EXPORT_AND_REIMPORT_REQUIRED)) {
- String lineBreak = ui.isCLI() ?
- Constants.LINE_SEPARATOR : Constants.HTML_LINE_BREAK;
- msg = new MessageBuilder(msg)
- .append(lineBreak)
- .append(ui.createUnorderedList(getExportImportInstructions()))
- .toMessage();
+ if (ui != null)
+ {
+ String lineBreak = ui.isCLI() ? Constants.LINE_SEPARATOR
+ : Constants.HTML_LINE_BREAK;
+ msg = new MessageBuilder(msg).append(lineBreak).append(
+ ui.createUnorderedList(getExportImportInstructions())).toMessage();
+ }
+ else
+ {
+ String lineBreak = Constants.LINE_SEPARATOR ;
+ msg = new MessageBuilder(msg).append(lineBreak).append(
+ createUnorderedList(getExportImportInstructions())).toMessage();
+ }
+
}
return msg;
}
+
/**
* {@inheritDoc}
*/
--
Gitblit v1.10.0