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/LDAPModify.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
index 829f36b..09cf837 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.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;
@@ -45,7 +45,7 @@
import org.forgerock.opendj.ldap.ConnectionFactory;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
-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;
@@ -93,7 +93,7 @@
Result r = connection.add(change);
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
- } catch (final ErrorResultException ere) {
+ } catch (final LdapException ere) {
return Utils.printErrorMessage(LDAPModify.this, ere);
}
}
@@ -111,7 +111,7 @@
Result r = connection.delete(change);
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
- } catch (final ErrorResultException ere) {
+ } catch (final LdapException ere) {
return printErrorMessage(LDAPModify.this, ere);
}
}
@@ -129,7 +129,7 @@
Result r = connection.modifyDN(change);
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
- } catch (final ErrorResultException ere) {
+ } catch (final LdapException ere) {
return Utils.printErrorMessage(LDAPModify.this, ere);
}
}
@@ -147,7 +147,7 @@
Result r = connection.modify(change);
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
- } catch (final ErrorResultException ere) {
+ } catch (final LdapException ere) {
return Utils.printErrorMessage(LDAPModify.this, ere);
}
}
@@ -456,7 +456,7 @@
if (!noop.isPresent()) {
try {
connection = connectionFactory.getConnection();
- } catch (final ErrorResultException ere) {
+ } catch (final LdapException ere) {
return Utils.printErrorMessage(this, ere);
}
}
--
Gitblit v1.10.0