From 65aba8bb05fb4a117a527496be2d0342b343963a Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 14 Mar 2015 01:46:09 +0000
Subject: [PATCH] OPENDJ-1848: minor improvements to DatabaseContainer
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index 698c897..91c78b2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -545,12 +545,7 @@
private NullIndex openNewNullIndex(WriteableStorage txn, String indexId, Indexer indexer)
{
- final TreeName indexName = getIndexName(indexId);
- final NullIndex index = new NullIndex(indexName, indexer, state, txn, this);
- state.putIndexTrustState(txn, index, false);
- txn.deleteTree(indexName);
- index.open(txn); // No-op
- return index;
+ return new NullIndex(getIndexName(indexId), indexer, state, txn, this);
}
/**
@@ -2801,7 +2796,7 @@
for (DatabaseContainer db : databases)
{
- txn.deleteTree(db.getName());
+ db.delete(txn);
}
}
@@ -2820,7 +2815,7 @@
// The state database can not be removed individually.
return;
}
- txn.deleteTree(database.getName());
+ database.delete(txn);
if(database instanceof Index)
{
state.removeIndexTrustState(txn, database);
@@ -2839,7 +2834,7 @@
attributeIndex.close();
for (Index index : attributeIndex.getAllIndexes())
{
- txn.deleteTree(index.getName());
+ index.delete(txn);
state.removeIndexTrustState(txn, index);
}
}
@@ -3063,7 +3058,7 @@
{
for (DatabaseContainer db : databases)
{
- txn.deleteTree(db.getName());
+ db.delete(txn);
}
}
finally
@@ -3095,7 +3090,7 @@
{
try
{
- txn.deleteTree(database.getName());
+ database.delete(txn);
}
finally
{
--
Gitblit v1.10.0