From c69031ec843ebd291b5125e66520610138baccc2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 13 Mar 2015 14:33:21 +0000
Subject: [PATCH] Fixed bugs in TracedStorage.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
index 7505b0d..64679f0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
@@ -279,18 +279,19 @@
@Override
public <T> T read(final ReadOperation<T> readOperation) throws Exception
{
+ ReadOperation<T> op = readOperation;
if (logger.isTraceEnabled())
{
- return storage.read(new ReadOperation<T>()
+ op = new ReadOperation<T>()
{
@Override
public T run(final ReadableStorage txn) throws Exception
{
return readOperation.run(new TracedReadableStorage(txn));
}
- });
+ };
}
- return storage.read(readOperation);
+ return storage.read(op);
}
@Override
@@ -324,22 +325,23 @@
@Override
public void write(final WriteOperation writeOperation) throws Exception
{
+ WriteOperation op = writeOperation;
if (logger.isTraceEnabled())
{
- storage.write(new WriteOperation()
+ op = new WriteOperation()
{
@Override
public void run(final WriteableStorage txn) throws Exception
{
writeOperation.run(new TracedWriteableStorage(txn));
}
- });
+ };
}
- storage.write(writeOperation);
+ storage.write(op);
}
private String hex(final ByteSequence bytes)
{
- return bytes.toByteString().toHexString();
+ return bytes != null ? bytes.toByteString().toHexString() : "null";
}
}
--
Gitblit v1.10.0