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/ReplicationBackend.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
index aa2fa28..b7c58a7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -151,11 +151,6 @@
private ReplicationServer server;
/**
- * The configuration of this backend.
- */
- private BackendCfg cfg;
-
- /**
* The number of milliseconds between job progress reports.
*/
private long progressInterval = 10000;
@@ -214,7 +209,7 @@
if (config != null)
{
Validator.ensureTrue(config instanceof BackendCfg);
- cfg = (BackendCfg)config;
+ BackendCfg cfg = (BackendCfg) config;
DN[] newBaseDNs = new DN[cfg.getBaseDN().size()];
cfg.getBaseDN().toArray(newBaseDNs);
setBaseDNs(newBaseDNs);
@@ -655,7 +650,7 @@
attrs);
ldifWriter.writeChangeRecord(changeRecord);
}
- catch (Exception e) {}
+ catch (Exception e) { /* do nothing */ }
for (ReplicationServerDomain exportContainer : exportContainers)
{
@@ -718,7 +713,7 @@
for (int serverId : rsd.getServers())
{
if (exportConfig != null && exportConfig.isCancelled())
- {
+ { // Abort if cancelled
break;
}
@@ -764,7 +759,7 @@
while (ri.getChange() != null)
{
if (exportConfig != null && exportConfig.isCancelled())
- {
+ { // abort if cancelled
break;
}
if (searchOperation != null)
@@ -988,8 +983,7 @@
LDIFWriter ldifWriter2 = writer.getLDIFWriter();
ldifWriter2.writeChangeRecord(changeRecord);
LDIFReader reader = writer.getLDIFReader();
- Entry modDNEntry = reader.readEntry();
- entry = modDNEntry;
+ entry = reader.readEntry();
}
}
--
Gitblit v1.10.0