From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java | 78 ++++----------------------------------
1 files changed, 9 insertions(+), 69 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index 7795711..5e7eefa 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -834,9 +834,8 @@
*/
public boolean isPeersNotFoundError(String logMsg)
{
- return logMsg.indexOf(
- "="+ReplicationMessages.
- ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.getId()) != -1;
+ return logMsg.contains("=" + ReplicationMessages.
+ ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.getId());
}
/**
@@ -1092,7 +1091,7 @@
fileProperties.load(fs);
}
catch (Throwable t)
- {
+ { /* do nothing */
}
finally
{
@@ -1103,7 +1102,7 @@
fs.close();
}
catch (Throwable t)
- {
+ { /* do nothing */
}
}
}
@@ -1115,9 +1114,8 @@
String configDir = Utils.getPath(Utils
.getInstancePathFromInstallPath(installPath),
Installation.CONFIG_PATH_RELATIVE);
- String propertiesFile = Utils.getPath(
+ return Utils.getPath(
configDir, Installation.DEFAULT_JAVA_PROPERTIES_FILE);
- return propertiesFile;
}
/**
@@ -1224,10 +1222,10 @@
String parsedMsg = null;
if (msg != null)
{
- if ((msg.indexOf(
- "msgID="+JebMessages.NOTE_JEB_IMPORT_FINAL_STATUS.getId()) != -1) ||
- (msg.indexOf(
- "msgID="+JebMessages.NOTE_JEB_IMPORT_PROGRESS_REPORT.getId()) != -1))
+ if ((msg.contains("msgID=" + JebMessages
+ .NOTE_JEB_IMPORT_FINAL_STATUS.getId())) ||
+ (msg.contains("msgID=" + JebMessages
+ .NOTE_JEB_IMPORT_PROGRESS_REPORT.getId())))
{
int index = msg.indexOf("msg=");
if (index != -1)
@@ -1240,61 +1238,3 @@
}
}
-/**
- * A class describing a replication domain.
- *
- */
-class DomainEntry
-{
- private String name;
- private int replicationId;
- private String baseDn;
- private Set<String> replicationServers;
- /**
- * The constructor of the domain entry.
- * @param name the name of the domain.
- * @param replicationId the replicationId of the domain.
- * @param baseDn the base dn of the domain.
- * @param replicationServers the list of replication servers for the domain.
- */
- public DomainEntry(String name, int replicationId, String baseDn,
- Set<String> replicationServers)
- {
- this.name = name;
- this.replicationId = replicationId;
- this.baseDn = baseDn;
- this.replicationServers = replicationServers;
- }
- /**
- * Returns the base dn of the domain.
- * @return the base dn of the domain.
- */
- public String getBaseDn()
- {
- return baseDn;
- }
- /**
- * Returns the name of the domain.
- * @return the name of the domain.
- */
- public String getName()
- {
- return name;
- }
- /**
- * Returns the replication Id of the domain.
- * @return the replication Id of the domain.
- */
- public int getReplicationId()
- {
- return replicationId;
- }
- /**
- * Returns the list of replication servers of the domain.
- * @return the list of replication servers of the domain.
- */
- public Set<String> getReplicationServers()
- {
- return replicationServers;
- }
-}
--
Gitblit v1.10.0