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/LDIFBackend.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/LDIFBackend.java b/opends/src/server/org/opends/server/backends/LDIFBackend.java
index 69ed96c..761a3b9 100644
--- a/opends/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opends/src/server/org/opends/server/backends/LDIFBackend.java
@@ -44,6 +44,7 @@
import org.opends.server.api.AlertGenerator;
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;
@@ -106,7 +107,7 @@
private DN[] baseDNs;
// The mapping between parent DNs and their immediate children.
- private HashMap<DN,HashSet<DN>> childDNs;
+ private final HashMap<DN,HashSet<DN>> childDNs;
// The base DNs for this backend, in a hash set.
private HashSet<DN> baseDNSet;
@@ -121,10 +122,10 @@
private LDIFBackendCfg currentConfig;
// The mapping between entry DNs and the corresponding entries.
- private LinkedHashMap<DN,Entry> entryMap;
+ private final LinkedHashMap<DN,Entry> entryMap;
// A read-write lock used to protect access to this backend.
- private ReentrantReadWriteLock backendLock;
+ private final ReentrantReadWriteLock backendLock;
// The path to the LDIF file containing the data for this backend.
private String ldifFilePath;
@@ -733,13 +734,12 @@
else
{
boolean subtreeDelete = false;
- for (Control c : deleteOperation.getRequestControls())
+
+ if (deleteOperation != null
+ && deleteOperation
+ .getRequestControl(SubtreeDeleteControl.DECODER) != null)
{
- if (c.getOID().equals(OID_SUBTREE_DELETE_CONTROL))
- {
- subtreeDelete = true;
- break;
- }
+ subtreeDelete = true;
}
if (! subtreeDelete)
@@ -1579,6 +1579,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void preloadEntryCache() throws UnsupportedOperationException {
throw new UnsupportedOperationException("Operation not supported.");
}
--
Gitblit v1.10.0