From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

---
 opends/src/server/org/opends/server/tools/tasks/TaskClient.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/tasks/TaskClient.java b/opends/src/server/org/opends/server/tools/tasks/TaskClient.java
index a00bbdf..ac0348f 100644
--- a/opends/src/server/org/opends/server/tools/tasks/TaskClient.java
+++ b/opends/src/server/org/opends/server/tools/tasks/TaskClient.java
@@ -266,11 +266,10 @@
 
     AddResponseProtocolOp addResponse =
          responseMessage.getAddResponseProtocolOp();
-    Message errorMessage = addResponse.getErrorMessage();
-    if (errorMessage != null) {
+    if (addResponse.getResultCode() != 0) {
       throw new LDAPException(
               LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
-              errorMessage);
+              addResponse.getErrorMessage());
     }
     return getTaskEntry(taskID);
   }

--
Gitblit v1.10.0