From 02a301787a2190f8ec50349bfde899be1f05c6ac Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 12 Oct 2015 12:42:17 +0000
Subject: [PATCH] Minor fix: don't use transactions for read operations
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
index 080c9af..8a21d3f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java
@@ -728,12 +728,9 @@
@Override
public <T> T read(final ReadOperation<T> operation) throws Exception
{
- final Transaction txn = beginTransaction();
try
{
- final T result = operation.run(newWriteableTransaction(txn));
- commit(txn);
- return result;
+ return operation.run(newWriteableTransaction(null));
}
catch (final StorageRuntimeException e)
{
@@ -743,10 +740,6 @@
}
throw e;
}
- finally
- {
- abort(txn);
- }
}
@Override
@@ -789,7 +782,7 @@
{
if (envConfig.getTransactional())
{
- final Transaction txn = env.beginTransaction(null, new TransactionConfig());
+ final Transaction txn = env.beginTransaction(null, null);
logger.trace("beginTransaction", "begin txnid=" + txn.getId());
return txn;
}
@@ -798,7 +791,7 @@
private void commit(final Transaction txn)
{
- if (envConfig.getTransactional())
+ if (txn != null)
{
txn.commit();
logger.trace("commit txnid=%d", txn.getId());
@@ -807,7 +800,7 @@
private void abort(final Transaction txn)
{
- if (envConfig.getTransactional())
+ if (txn != null)
{
txn.abort();
logger.trace("abort txnid=%d", txn.getId());
--
Gitblit v1.10.0