From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/tools/LDAPDelete.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPDelete.java b/opends/src/server/org/opends/server/tools/LDAPDelete.java
index bb49189..ea0ae3e 100644
--- a/opends/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opends/src/server/org/opends/server/tools/LDAPDelete.java
@@ -39,15 +39,11 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.opends.server.protocols.asn1.ASN1Exception;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.DeleteRequestProtocolOp;
import org.opends.server.protocols.ldap.DeleteResponseProtocolOp;
-import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
-import org.opends.server.types.NullOutputStream;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.LDAPException;
+import org.opends.server.types.*;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.PasswordReader;
import org.opends.server.util.args.ArgumentException;
@@ -58,6 +54,8 @@
import org.opends.server.util.args.StringArgument;
import static org.opends.server.loggers.debug.DebugLogger.*;
+
+import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
@@ -85,13 +83,13 @@
// The message ID counter to use for requests.
- private AtomicInteger nextMessageID;
+ private final AtomicInteger nextMessageID;
// The print stream to use for standard error.
- private PrintStream err;
+ private final PrintStream err;
// The print stream to use for standard output.
- private PrintStream out;
+ private final PrintStream out;
@@ -177,9 +175,9 @@
LDAPDeleteOptions deleteOptions)
throws IOException, LDAPException
{
- ArrayList<LDAPControl> controls = deleteOptions.getControls();
+ ArrayList<Control> controls = deleteOptions.getControls();
ProtocolOp protocolOp = null;
- ASN1OctetString asn1OctetStr = new ASN1OctetString(line);
+ ByteString asn1OctetStr = ByteString.valueOf(line);
protocolOp = new DeleteRequestProtocolOp(asn1OctetStr);
@@ -702,7 +700,7 @@
{
for (String ctrlString : controlStr.getValues())
{
- LDAPControl ctrl = LDAPToolUtils.getControl(ctrlString, err);
+ Control ctrl = LDAPToolUtils.getControl(ctrlString, err);
if(ctrl == null)
{
Message message = ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
@@ -716,7 +714,7 @@
if(deleteOptions.getDeleteSubtree())
{
- LDAPControl control = new LDAPControl(OID_SUBTREE_DELETE_CONTROL);
+ Control control = new SubtreeDeleteControl(false);
deleteOptions.getControls().add(control);
}
--
Gitblit v1.10.0