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/extensions/CancelExtendedOperation.java | 14 +++++++++++++-
1 files changed, 13 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 da83334..e465a1f 100644
--- a/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
+++ b/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
@@ -113,6 +113,7 @@
* Performs any finalization that may be necessary for this extended
* operation handler. By default, no finalization is performed.
*/
+ @Override
public void finalizeExtendedOperationHandler()
{
DirectoryServer.deregisterSupportedExtension(OID_CANCEL_REQUEST);
@@ -184,5 +185,16 @@
operation.setResultCode(cancelResult.getResultCode());
operation.appendErrorMessage(cancelResult.getResponseMessage());
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getExtendedOperationName()
+ {
+ return "Cancel";
+ }
}
--
Gitblit v1.10.0