From 1a9b0c4c35b0fbcc2cf09db1f40a17fc76cb4a90 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 26 Mar 2014 09:54:47 +0000
Subject: [PATCH] Minor code cleanup.
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 6b3be70..57bafa9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -61,7 +61,6 @@
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
-import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
import com.forgerock.opendj.cli.Argument;
@@ -202,7 +201,6 @@
{
if (app.isInteractive()
&& ci.isTrustStoreInMemory()
- && e.getCause() != null
&& e.getCause() instanceof SSLException
&& e.getCause().getCause() instanceof CertificateException)
{
@@ -354,7 +352,7 @@
// arguments.
LocalizableMessageBuilder buf = new LocalizableMessageBuilder();
int v = secureArgsList.validateGlobalOptions(buf);
- if (v != ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode())
+ if (v != ReturnCode.SUCCESS.get())
{
throw new ArgumentException(buf.toMessage());
}
--
Gitblit v1.10.0