From ae2936fbee9671c508816da114cb64472317d2c1 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 15 Apr 2014 14:59:12 +0000
Subject: [PATCH] Fix for OPENDJ-1425 dsconfig output is incorrect when configuring LDAPS connection handler in interactive mode
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
index 3f50667..5ddce51 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
@@ -201,8 +201,7 @@
@Override
public void display(ConsoleApplication app) {
app.println();
- HelpSubCommandHandler.displaySingleComponent(app, mo
- .getManagedObjectDefinition(), properties);
+ HelpSubCommandHandler.displaySingleComponent(app, mo, properties);
app.println();
app.pressReturnToContinue();
}
@@ -2254,7 +2253,11 @@
// Construct the main menu.
MenuBuilder<Boolean> builder = new MenuBuilder<Boolean>(app);
- LocalizableMessage ufn = mo.getManagedObjectDefinition().getUserFriendlyName();
+ String ufn = mo.getManagedObjectPath().getName();
+ if (ufn == null)
+ {
+ ufn = mo.getManagedObjectDefinition().getUserFriendlyName().toString();
+ }
builder.setPrompt(INFO_EDITOR_HEADING_CONFIGURE_COMPONENT.get(ufn));
LocalizableMessage heading1 = INFO_DSCFG_HEADING_PROPERTY_NAME.get();
--
Gitblit v1.10.0