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-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
index 46def3d..322f95d 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
@@ -200,7 +200,7 @@
       {
         // duplicate entry.
         result = Responses.newResult(ResultCode.ENTRY_ALREADY_EXISTS);
-        final ErrorResultException ere = ErrorResultException.wrap(result);
+        final ErrorResultException ere = ErrorResultException.newErrorResult(result);
         handler.handleErrorResult(ere);
         // doesn't matter if it was canceled.
         requestsInProgress.remove(context);
@@ -222,7 +222,7 @@
       if (abReq.isCanceled())
       {
         result = Responses.newResult(ResultCode.CANCELLED);
-        final ErrorResultException ere = ErrorResultException.wrap(result);
+        final ErrorResultException ere = ErrorResultException.newErrorResult(result);
         handler.handleErrorResult(ere);
         requestsInProgress.remove(context);
         return;
@@ -349,7 +349,7 @@
                   }
                   catch (SaslException e)
                   {
-                    throw ErrorResultException.wrap(Responses.newResult(
+                    throw ErrorResultException.newErrorResult(Responses.newResult(
                         ResultCode.OPERATIONS_ERROR).setCause(e));
                   }
                 }
@@ -365,7 +365,7 @@
                   }
                   catch (SaslException e)
                   {
-                    throw ErrorResultException.wrap(Responses.newResult(
+                    throw ErrorResultException.newErrorResult(Responses.newResult(
                         ResultCode.OPERATIONS_ERROR).setCause(e));
                   }
                 }
@@ -384,7 +384,7 @@
         }
         catch (Exception e)
         {
-          resultHandler.handleErrorResult(ErrorResultException.wrap(Responses
+          resultHandler.handleErrorResult(ErrorResultException.newErrorResult(Responses
               .newBindResult(ResultCode.OPERATIONS_ERROR).setCause(e)
               .setDiagnosticMessage(e.toString())));
         }
@@ -469,7 +469,7 @@
       {
         // entry not found.
         result = Responses.newCompareResult(ResultCode.NO_SUCH_ATTRIBUTE);
-        final ErrorResultException ere = ErrorResultException.wrap(result);
+        final ErrorResultException ere = ErrorResultException.newErrorResult(result);
         resultHandler.handleErrorResult(ere);
         // doesn't matter if it was canceled.
         requestsInProgress.remove(context);
@@ -488,7 +488,7 @@
           if (abReq.isCanceled())
           {
             final Result r = Responses.newResult(ResultCode.CANCELLED);
-            final ErrorResultException ere = ErrorResultException.wrap(r);
+            final ErrorResultException ere = ErrorResultException.newErrorResult(r);
             resultHandler.handleErrorResult(ere);
             requestsInProgress.remove(context);
             return;
@@ -529,7 +529,7 @@
       {
         // entry is not found.
         result = Responses.newResult(ResultCode.NO_SUCH_OBJECT);
-        final ErrorResultException ere = ErrorResultException.wrap(result);
+        final ErrorResultException ere = ErrorResultException.newErrorResult(result);
         handler.handleErrorResult(ere);
         // doesn't matter if it was canceled.
         requestsInProgress.remove(context);
@@ -539,7 +539,7 @@
       if (abReq.isCanceled())
       {
         result = Responses.newResult(ResultCode.CANCELLED);
-        final ErrorResultException ere = ErrorResultException.wrap(result);
+        final ErrorResultException ere = ErrorResultException.newErrorResult(result);
         handler.handleErrorResult(ere);
         requestsInProgress.remove(context);
         return;
@@ -633,7 +633,7 @@
       {
         // Entry not found.
         result = Responses.newResult(ResultCode.NO_SUCH_OBJECT);
-        final ErrorResultException ere = ErrorResultException.wrap(result);
+        final ErrorResultException ere = ErrorResultException.newErrorResult(result);
         resultHandler.handleErrorResult(ere);
         // Should searchResultHandler handle anything?
 
@@ -645,7 +645,7 @@
       if (abReq.isCanceled())
       {
         result = Responses.newResult(ResultCode.CANCELLED);
-        final ErrorResultException ere = ErrorResultException.wrap(result);
+        final ErrorResultException ere = ErrorResultException.newErrorResult(result);
         resultHandler.handleErrorResult(ere);
         requestsInProgress.remove(context);
         return;

--
Gitblit v1.10.0