From 791840ef10ecb9f25b4c3b97eacbf848bf75a261 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 24 Apr 2013 12:44:51 +0000
Subject: [PATCH] Replication Cleanup.
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java
index ecd0b73..f14be05 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.replication.server;
import org.opends.messages.*;
@@ -168,9 +168,6 @@
if (str[0].equals(GENERATION_ID_TAG))
{
long generationId;
-
- String baseDn;
-
try
{
// <generationId>
@@ -186,7 +183,7 @@
+ "<" + str[1] + ">"));
}
- baseDn = str[2];
+ String baseDn = str[2];
if (debugEnabled())
TRACER.debugInfo(
@@ -213,7 +210,7 @@
status = cursor.getFirst(key, data, LockMode.DEFAULT);
while (status == OperationStatus.SUCCESS)
{
- String stringData = null;
+ String stringData;
try
{
stringData = new String(data.getData(), "UTF-8");
@@ -234,7 +231,7 @@
String[] str = stringData.split(FIELD_SEPARATOR, 2);
if (!str[0].equals(GENERATION_ID_TAG))
{
- int serverId = -1;
+ int serverId;
try
{
// <serverId>
@@ -561,14 +558,14 @@
txn.abort();
}
catch(Exception e)
- {}
+ { /* do nothing */ }
}
}
/**
* Get or create a db to manage integer change number associated
* to multidomain server state.
- * TODO:ECL how to manage compatibilty of this db with new domains
+ * TODO:ECL how to manage compatibility of this db with new domains
* added or removed ?
* @return the retrieved or created db.
* @throws DatabaseException when a problem occurs.
@@ -583,8 +580,7 @@
DatabaseConfig dbConfig = new DatabaseConfig();
dbConfig.setAllowCreate(true);
dbConfig.setTransactional(true);
- Database db = dbEnvironment.openDatabase(null, stringId, dbConfig);
- return db;
+ return dbEnvironment.openDatabase(null, stringId, dbConfig);
}
}
--
Gitblit v1.10.0