Merge Bo's most recent changes.

matthew_swift

04.12.2009 fa59221ed4c2777097b0fd1a38c6839d60680499

 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);
    }
  }
}