From fab0454fde958c756d895844529b441f11d5a12c Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Sat, 22 Sep 2012 14:31:07 +0000
Subject: [PATCH] Minor code cleanup : remove of useless initializations and tests.
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
index dec2a8a..e4a8473 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions Copyright 2012 ForgeRock AS
*/
package org.opends.server.tools.dsreplication;
@@ -96,7 +97,7 @@
boolean applyTimeout = uData.getMaximumDuration() > 0;
long startTime = TimeThread.getTime();
- long purgeMaxTime = getTimeoutInSeconds() * 1000;
+ long purgeMaxTime = getTimeoutInSeconds() * 1000L;
long endMaxTime = startTime + purgeMaxTime;
@@ -106,7 +107,6 @@
PointAdder pointAdder = new PointAdder(app);
pointAdder.start();
- LDAPReplicationDomain domain = null;
Class<?> cfgClass;
try
@@ -166,7 +166,8 @@
{
DN dn = DN.decode(baseDN);
// We can assume that this is an LDAP replication domain
- domain = LDAPReplicationDomain.retrievesReplicationDomain(dn);
+ LDAPReplicationDomain domain =
+ LDAPReplicationDomain.retrievesReplicationDomain(dn);
domain.purgeConflictsHistorical(null, startTime + purgeMaxTime);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index a01ade5..2050120 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -8043,7 +8043,7 @@
domains[i] = sync.getReplicationDomain(domainNames[i]);
}
ReplicationDomainCfgClient domain = null;
- for (int i=0; i<domains.length && (domain == null); i++)
+ for (int i=0; i<domains.length; i++)
{
if (Utils.areDnsEqual(baseDN, domains[i].getBaseDN().toString()))
{
--
Gitblit v1.10.0