Merge Bo's most recent changes.

matthew_swift

04.12.2009 20df27fbd253139d3e5a24dd6e8063ed11dd1fab

 sdk/src/org/opends/sdk/AbstractConnection.java

@@ -254,10 +254,10 @@
    {
      // Got more entries than expected.
      Result result = Responses.newResult(
          ResultCode.CLIENT_SIDE_LOCAL_ERROR).setDiagnosticMessage(
          ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN).setDiagnosticMessage(
          ERR_UNEXPECTED_SEARCH_RESULT_ENTRIES.get(handler.entryCount)
              .toString());
      throw new ErrorResultException(result);
      throw ErrorResultException.wrap(result);
    }
    else if (handler.firstReference != null)
    {
@@ -267,7 +267,7 @@
          ERR_UNEXPECTED_SEARCH_RESULT_REFERENCES.get(
              handler.firstReference.getURIs().iterator().next())
              .toString());
      throw new ErrorResultException(result);
      throw ErrorResultException.wrap(result);
    }
    else
    {