From 300625b855bded33c79af6570d9bcdd6f9aca7c6 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 07 Jul 2009 00:12:51 +0000
Subject: [PATCH] Improve the displayed messages when an ADSContextException occurs. i18n the messages of the ADSContextException. Make dsreplication consistent with the fix made for dsconfig (see issue 4091). Fix a bug in ADSContext when deleting the contents of the ADS. Fix a bug in the equivalent command display when the user chooses to disable all replication on a server or to disable the replication server.
---
opendj-sdk/opends/src/ads/org/opends/admin/ads/SubtreeDeleteControl.java | 43 +++++++------------------------------------
1 files changed, 7 insertions(+), 36 deletions(-)
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/SubtreeDeleteControl.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/SubtreeDeleteControl.java
index f63ae8b..b29d891 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/SubtreeDeleteControl.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/SubtreeDeleteControl.java
@@ -22,17 +22,17 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.admin.ads;
-import javax.naming.ldap.Control;
+import javax.naming.ldap.BasicControl;
/**
* This class implements the LDAP subtree delete control for JNDI.
*/
-public class SubtreeDeleteControl implements Control
+public class SubtreeDeleteControl extends BasicControl
{
/**
* The serial version identifier required to satisfy the compiler
@@ -44,39 +44,10 @@
static final long serialVersionUID = 3941576361457157921L;
/**
- * Retrieves the object identifier assigned for the LDAP control.
- *
- * @return The non-null object identifier string.
+ * Default constructor.
*/
- public String getID() {
- return "1.2.840.113556.1.4.805";
+ public SubtreeDeleteControl()
+ {
+ super("1.2.840.113556.1.4.805");
}
-
- /**
- * Determines the criticality of the LDAP control.
- * A critical control must not be ignored by the server.
- * In other words, if the server receives a critical control
- * that it does not support, regardless of whether the control
- * makes sense for the operation, the operation will not be performed
- * and an <tt>OperationNotSupportedException</tt> will be thrown.
- * @return true if this control is critical; false otherwise.
- */
- public boolean isCritical() {
- return true;
- }
-
- /**
- * Retrieves the ASN.1 BER encoded value of the LDAP control.
- * The result is the raw BER bytes including the tag and length of
- * the control's value. It does not include the controls OID or criticality.
- *
- * Null is returned if the value is absent.
- *
- * @return A possibly null byte array representing the ASN.1 BER encoded
- * value of the LDAP control.
- */
- public byte[] getEncodedValue() {
- return new byte[] {};
- }
-
}
--
Gitblit v1.10.0