From 61d88f370658a798a2e255d1ba37dd1305e47a5c Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Mon, 17 Mar 2008 16:22:34 +0000
Subject: [PATCH] Fix erroneous non-transactional error message when entry container is cleared during import.
---
opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 50aa260..d04b05e 100644
--- a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -4464,7 +4464,9 @@
Transaction txn = null;
try
{
- txn = beginTransaction();
+ if(env.getConfig().getTransactional()) {
+ txn = beginTransaction();
+ }
for(DatabaseContainer db : databases)
{
if (db instanceof Index)
@@ -4473,7 +4475,9 @@
index.setTrusted(txn, true);
}
}
- transactionCommit(txn);
+ if(env.getConfig().getTransactional()) {
+ transactionCommit(txn);
+ }
}
catch(Exception de)
{
--
Gitblit v1.10.0