From fa59221ed4c2777097b0fd1a38c6839d60680499 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 04 Dec 2009 11:12:28 +0000
Subject: [PATCH] Merge Bo's most recent changes.

---
 opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java b/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java
index f80baf0..93fb7c4 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java
+++ b/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java
@@ -116,10 +116,10 @@
       future.cancel(false);
 
       Result result =
-          Responses.newResult(ResultCode.CLIENT_SIDE_LOCAL_ERROR)
+          Responses.newResult(ResultCode.CLIENT_SIDE_CONNECT_ERROR)
               .setCause(e)
               .setDiagnosticMessage(e.getLocalizedMessage());
-      throw new ErrorResultException(result);
+      throw ErrorResultException.wrap(result);
     }
   }
 }

--
Gitblit v1.10.0