From 2e1954d85b5105fb81b38d367e5a0d6356669e47 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 09 May 2012 09:56:34 +0000
Subject: [PATCH] Fix OPENDJ-488: Cancel request succeeds with result code 118 (CANCELED) when it should receive result code 0 (SUCCESS)
---
opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java b/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
index e465a1f..b24c623 100644
--- a/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
+++ b/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -182,7 +183,9 @@
// Update the result of the extended operation and return.
- operation.setResultCode(cancelResult.getResultCode());
+ ResultCode resultCode = cancelResult.getResultCode();
+ operation.setResultCode(resultCode == ResultCode.CANCELED
+ ? ResultCode.SUCCESS : resultCode);
operation.appendErrorMessage(cancelResult.getResponseMessage());
}
--
Gitblit v1.10.0