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/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java b/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
index 77b59b6..b3a566f 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
@@ -30,6 +30,8 @@
+import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
+
import java.io.IOException;
import java.net.SocketAddress;
import java.util.concurrent.ExecutionException;
@@ -40,7 +42,6 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.requests.StartTLSExtendedRequest;
import org.forgerock.opendj.ldap.responses.ExtendedResult;
-import org.forgerock.opendj.ldap.responses.Responses;
import org.forgerock.opendj.ldap.responses.Result;
import org.glassfish.grizzly.CompletionHandler;
import org.glassfish.grizzly.Connection;
@@ -156,22 +157,18 @@
@Override
public void failed(final Throwable throwable)
{
- final Result errorResult = Responses
- .newResult(ResultCode.CLIENT_SIDE_CONNECT_ERROR)
- .setCause(throwable)
- .setDiagnosticMessage(throwable.getMessage());
- handler.handleErrorResult(ErrorResultException
- .wrap(errorResult));
+ handler.handleErrorResult(newErrorResult(
+ ResultCode.CLIENT_SIDE_CONNECT_ERROR,
+ throwable.getMessage(), throwable));
}
});
return null;
}
catch (final IOException ioe)
{
- final Result errorResult = Responses
- .newResult(ResultCode.CLIENT_SIDE_CONNECT_ERROR)
- .setCause(ioe).setDiagnosticMessage(ioe.getMessage());
- throw ErrorResultException.wrap(errorResult);
+ throw newErrorResult(
+ ResultCode.CLIENT_SIDE_CONNECT_ERROR,
+ ioe.getMessage(), ioe);
}
}
handler.handleResult(null);
@@ -345,9 +342,7 @@
t = t.getCause();
}
- final Result result = Responses
- .newResult(ResultCode.CLIENT_SIDE_CONNECT_ERROR).setCause(t)
- .setDiagnosticMessage(t.getMessage());
- return ErrorResultException.wrap(result);
+ return newErrorResult(ResultCode.CLIENT_SIDE_CONNECT_ERROR,
+ t.getMessage(), t);
}
}
--
Gitblit v1.10.0