From a0914678050ef263e860f3818c9cc72f7b7ab463 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 04 Dec 2013 10:25:09 +0000
Subject: [PATCH] OPENDJ-1107: Unexpected error when importing/exporting data as non-privileged user. CR-2657.
---
opendj-sdk/opends/src/messages/messages/tools.properties | 1 +
opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java | 4 ++--
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index c307e45..6e1d833 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -2578,3 +2578,4 @@
INFO_UPGRADE_TASK_9013_DESCRIPTION_10019=OpenDJ 2.5.0-Xpress1 introduced a \
regression in the ds-sync-hist ordering index. This index has to be rebuilt and this could take a long time \
to proceed. Do you want to launch this process at automatically at the end of the upgrade?
+SEVERE_ERR_TASK_TOOL_LDAP_ERROR_10020=ERROR: The server rejected the task for the following reason: %s
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java
index 9e4240e..80b82ac 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.tools.tasks;
@@ -372,7 +372,7 @@
if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
ret = 1;
} catch (LDAPException le) {
- Message message = ERR_TASK_TOOL_DECODE_ERROR.get(le.getMessage());
+ Message message = ERR_TASK_TOOL_LDAP_ERROR.get(le.getMessage());
if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
ret = 1;
} catch (OpenDsException e) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index efa37f3..497fd6b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -462,7 +462,7 @@
{
// replacement reason returned to the user
operation.setResultCode(altResultCode);
- operation.appendMaskedErrorMessage(altMessage);
+ operation.appendErrorMessage(altMessage);
// real underlying reason
operation.setMaskedResultCode(resultCode);
operation.appendMaskedErrorMessage(message);
--
Gitblit v1.10.0