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/backends/MemoryBackend.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/MemoryBackend.java b/opends/src/server/org/opends/server/backends/MemoryBackend.java
index 054570b..eb1e2be 100644
--- a/opends/src/server/org/opends/server/backends/MemoryBackend.java
+++ b/opends/src/server/org/opends/server/backends/MemoryBackend.java
@@ -39,6 +39,7 @@
import org.opends.server.admin.std.server.MemoryBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
+import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -475,15 +476,12 @@
// Check to see if the entry contains a subtree delete control.
boolean subtreeDelete = false;
- if (deleteOperation != null)
+
+ if (deleteOperation != null
+ && deleteOperation
+ .getRequestControl(SubtreeDeleteControl.DECODER) != null)
{
- for (Control c : deleteOperation.getRequestControls())
- {
- if (c.getOID().equals(OID_SUBTREE_DELETE_CONTROL))
- {
- subtreeDelete = true;
- }
- }
+ subtreeDelete = true;
}
HashSet<DN> children = childDNs.get(entryDN);
@@ -989,6 +987,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void preloadEntryCache() throws UnsupportedOperationException {
throw new UnsupportedOperationException("Operation not supported.");
}
--
Gitblit v1.10.0