From b795e027216c93c7feca7f6e8faece6f8f51985a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Sep 2013 12:27:44 +0000
Subject: [PATCH] Added spaces between error messages and stack traces.
---
opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
index 04e85d9..f7c55d1 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
@@ -58,8 +58,8 @@
private static final DebugTracer TRACER = getTracer();
private static final int DATABASE_EMPTY = 0;
- private Database db = null;
- private ReplicationDbEnv dbenv = null;
+ private Database db;
+ private ReplicationDbEnv dbenv;
/**
* The lock used to provide exclusive access to the thread that close the db
@@ -168,7 +168,8 @@
catch (DatabaseException e)
{
MessageBuilder mb = new MessageBuilder();
- mb.append(NOTE_EXCEPTION_CLOSING_DATABASE.get(this.toString()));
+ mb.append(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString()));
+ mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
logError(mb.toMessage());
}
@@ -231,7 +232,7 @@
// If the DB has been closed then return immediately.
if (isDBClosed())
{
- return 0;
+ return DATABASE_EMPTY;
}
cursor = db.openCursor(null, null);
@@ -252,7 +253,7 @@
catch (DatabaseException e)
{
dbenv.shutdownOnException(e);
- return 0;
+ return DATABASE_EMPTY;
}
}
@@ -268,7 +269,7 @@
// If the DB has been closed then return immediately.
if (isDBClosed())
{
- return 0L;
+ return DATABASE_EMPTY;
}
return db.count();
@@ -281,7 +282,7 @@
{
dbCloseLock.readLock().unlock();
}
- return 0L;
+ return DATABASE_EMPTY;
}
/**
@@ -299,7 +300,7 @@
// If the DB has been closed then return immediately.
if (isDBClosed())
{
- return 0;
+ return DATABASE_EMPTY;
}
cursor = db.openCursor(null, null);
@@ -320,7 +321,7 @@
catch (DatabaseException e)
{
dbenv.shutdownOnException(e);
- return 0;
+ return DATABASE_EMPTY;
}
}
@@ -348,7 +349,7 @@
private final Transaction txn;
private final DatabaseEntry key;
private final DatabaseEntry entry;
- private DraftCNData seqnumData = null;
+ private DraftCNData seqnumData;
private boolean isClosed = false;
@@ -740,9 +741,8 @@
catch(Exception e)
{
MessageBuilder mb = new MessageBuilder();
- mb.append(ERR_ERROR_CLEARING_DB.get(this.toString(),
- e.getMessage() + " " +
- stackTraceToSingleLineString(e)));
+ mb.append(ERR_ERROR_CLEARING_DB.get(toString(),
+ e.getMessage() + " " + stackTraceToSingleLineString(e)));
logError(mb.toMessage());
}
finally
--
Gitblit v1.10.0