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-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
index 2d2d3e8..9f8d349 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
@@ -52,7 +52,7 @@
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
import org.forgerock.opendj.ldap.Entry;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.Function;
import org.forgerock.opendj.ldap.Modification;
@@ -476,9 +476,9 @@
completeIfNecessary(SUCCESS);
}
}
- }).onFailure(new FailureHandler<ErrorResultException>() {
+ }).onFailure(new FailureHandler<LdapException>() {
@Override
- public void handleError(ErrorResultException error) {
+ public void handleError(LdapException error) {
synchronized (sequenceLock) {
completeIfNecessary(asResourceException(error));
}
@@ -537,9 +537,9 @@
public void handleResult(final SearchResultEntry entry) {
adaptEntry(c, entry, h);
}
- }).onFailure(new FailureHandler<ErrorResultException>() {
+ }).onFailure(new FailureHandler<LdapException>() {
@Override
- public void handleError(final ErrorResultException error) {
+ public void handleError(final LdapException error) {
h.handleError(asResourceException(error));
}
});
@@ -621,9 +621,9 @@
h.handleError(asResourceException(e));
}
}
- }).onFailure(new FailureHandler<ErrorResultException>() {
+ }).onFailure(new FailureHandler<LdapException>() {
@Override
- public void handleError(final ErrorResultException error) {
+ public void handleError(final LdapException error) {
h.handleError(asResourceException(error));
}
});
@@ -681,9 +681,9 @@
updateHandler.handleError(asResourceException(e));
}
}
- }).onFailure(new FailureHandler<ErrorResultException>() {
+ }).onFailure(new FailureHandler<LdapException>() {
@Override
- public void handleError(final ErrorResultException error) {
+ public void handleError(final LdapException error) {
updateHandler.handleError(asResourceException(error));
}
});
@@ -980,10 +980,10 @@
};
}
- private FailureHandler<ErrorResultException> postEmptyPatchFailureHandler(final ResultHandler<Resource> h) {
- return new FailureHandler<ErrorResultException>() {
+ private FailureHandler<LdapException> postEmptyPatchFailureHandler(final ResultHandler<Resource> h) {
+ return new FailureHandler<LdapException>() {
@Override
- public void handleError(final ErrorResultException error) {
+ public void handleError(final LdapException error) {
h.handleError(asResourceException(error));
}
};
@@ -1025,11 +1025,11 @@
};
}
- private FailureHandler<ErrorResultException> postUpdateFailureHandler(final ResultHandler<Resource> handler) {
+ private FailureHandler<LdapException> postUpdateFailureHandler(final ResultHandler<Resource> handler) {
// The handler which will be invoked for the LDAP add result.
- return new FailureHandler<ErrorResultException>() {
+ return new FailureHandler<LdapException>() {
@Override
- public void handleError(final ErrorResultException error) {
+ public void handleError(final LdapException error) {
handler.handleError(asResourceException(error));
}
};
--
Gitblit v1.10.0