From 6385fb6984cb076c5a4a3ef5233deed798dc81c2 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 02 Jun 2011 01:01:18 +0000
Subject: [PATCH] Fix OPENDJ-183: Add support for RequestContext and RequestHandlers
---
opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
index 347637c..598df04 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
@@ -32,6 +32,7 @@
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
+import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
import java.io.FileInputStream;
import java.io.IOException;
@@ -50,7 +51,6 @@
import org.forgerock.opendj.ldap.requests.DeleteRequest;
import org.forgerock.opendj.ldap.requests.ModifyDNRequest;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
-import org.forgerock.opendj.ldap.responses.Responses;
import org.forgerock.opendj.ldap.responses.Result;
import org.forgerock.opendj.ldif.*;
@@ -87,9 +87,9 @@
{
// This shouldn't happen because there are no other threads
// to interrupt this one.
- r = Responses.newResult(ResultCode.CLIENT_SIDE_USER_CANCELLED)
- .setCause(e).setDiagnosticMessage(e.getLocalizedMessage());
- throw ErrorResultException.wrap(r);
+ throw newErrorResult(
+ ResultCode.CLIENT_SIDE_USER_CANCELLED,
+ e.getLocalizedMessage(), e);
}
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
@@ -127,9 +127,8 @@
{
// This shouldn't happen because there are no other threads
// to interrupt this one.
- r = Responses.newResult(ResultCode.CLIENT_SIDE_USER_CANCELLED)
- .setCause(e).setDiagnosticMessage(e.getLocalizedMessage());
- throw ErrorResultException.wrap(r);
+ throw newErrorResult(ResultCode.CLIENT_SIDE_USER_CANCELLED,
+ e.getLocalizedMessage(), e);
}
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
@@ -167,9 +166,8 @@
{
// This shouldn't happen because there are no other threads
// to interrupt this one.
- r = Responses.newResult(ResultCode.CLIENT_SIDE_USER_CANCELLED)
- .setCause(e).setDiagnosticMessage(e.getLocalizedMessage());
- throw ErrorResultException.wrap(r);
+ throw newErrorResult(ResultCode.CLIENT_SIDE_USER_CANCELLED,
+ e.getLocalizedMessage(), e);
}
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
@@ -207,9 +205,8 @@
{
// This shouldn't happen because there are no other threads
// to interrupt this one.
- r = Responses.newResult(ResultCode.CLIENT_SIDE_USER_CANCELLED)
- .setCause(e).setDiagnosticMessage(e.getLocalizedMessage());
- throw ErrorResultException.wrap(r);
+ throw newErrorResult(ResultCode.CLIENT_SIDE_USER_CANCELLED,
+ e.getLocalizedMessage(), e);
}
printResult(opType, change.getName().toString(), r);
return r.getResultCode().intValue();
--
Gitblit v1.10.0