modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
| 19 ++++------
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 82e21e6ae2e3a92dd6f36e7f67f2609dc785692f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jul 1 09:14:06 2013 -0500
[BZ 976790] Updated the parsing of rqh server properties to be consistent with the
rest of the code.
diff --git
a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
index f18bea1..8a0f64c 100644
---
a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
+++
b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
@@ -367,22 +367,21 @@ public class DataMigratorRunner {
if (serverProperties.getProperty("rhq.cassandra.seeds") != null
&&
!serverProperties.getProperty("rhq.cassandra.seeds").trim().isEmpty()) {
- StringBuffer seedHosts = new StringBuffer();
- String cassandraPort = null;
- for (String seed :
serverProperties.getProperty("rhq.cassandra.seeds").split(",")) {
- String[] params = seed.split("\\|");
+ String[] unparsedSeeds
=serverProperties.getProperty("rhq.cassandra.seeds").split(",");
+ String[] seedHosts = new String[unparsedSeeds.length];
+ Integer cassandraPort = null;
+ for (int index = 0; index < unparsedSeeds.length; index++) {
+ String[] params = unparsedSeeds[index].split("\\|");
if (params.length != 3) {
throw new IllegalArgumentException(
- "Expected string of the form,
hostname|jmxPort|nativeTransportPort: [" + seed + "]");
+ "Expected string of the form,
hostname|jmxPort|nativeTransportPort: [" + unparsedSeeds[index] + "]");
}
- seedHosts.append(params[0]).append(',');
- cassandraPort = tryParseInteger(params[2], DEFAULT_CASSANDRA_PORT) +
"";
+ seedHosts[index] = params[0];
+ cassandraPort = tryParseInteger(params[2], DEFAULT_CASSANDRA_PORT);
}
- seedHosts.deleteCharAt(seedHosts.length() - 1);
-
- configuration.put(cassandraHostsOption, seedHosts.toString());
+ configuration.put(cassandraHostsOption, seedHosts);
configuration.put(cassandraPortOption, cassandraPort);
}
}
Show replies by date