From d94f6d23898f7515e969517f85b8e626667a1e02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 08:56:38 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
index 8880a39..b143ae9 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package com.forgerock.opendj.ldap.tools;
@@ -46,7 +46,7 @@
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ConnectionFactory;
import org.forgerock.opendj.ldap.DecodeException;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.controls.AssertionRequestControl;
@@ -121,7 +121,7 @@
println(INFO_COMPARE_OPERATION_RESULT_TRUE.get(request.getName().toString()));
}
- } catch (final ErrorResultException ere) {
+ } catch (final LdapException ere) {
final LocalizableMessage msg = INFO_OPERATION_FAILED.get("COMPARE");
errPrintln(msg);
final Result r = ere.getResult();
@@ -362,7 +362,7 @@
if (!noop.isPresent()) {
try {
connection = connectionFactory.getConnection();
- } catch (final ErrorResultException ere) {
+ } catch (final LdapException ere) {
errPrintln(LocalizableMessage.raw(ere.getMessage()));
return ere.getResult().getResultCode().intValue();
}
--
Gitblit v1.10.0