Author: [email protected]
Date: Thu Mar 10 12:35:55 2011
New Revision: 867
Log:
[AMDATU-287] Fixed less error-prone String to Int conversion
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
Thu Mar 10 12:35:55 2011
@@ -115,7 +115,7 @@
throw new ConfigurationException("Missing configuration key",
CONFIG_WORKDIR);
}
m_workDir = relativeToAbsolute((String)
dictionary.get(CONFIG_WORKDIR));
- m_defaultReplicationFactor =
Integer.parseInt(dictionary.get(DEFAULT_REPLICATION_FACTOR).toString());
+ m_defaultReplicationFactor =
toInt(dictionary.get(DEFAULT_REPLICATION_FACTOR));
m_readConsistencyLevel =
ConsistencyLevel.valueOf(dictionary.get(READ_CONSISTENCY_LEVEL).toString());
m_writeConsistencyLevel =
ConsistencyLevel.valueOf(dictionary.get(WRITE_CONSISTENCY_LEVEL).toString());
m_bootstrapMode =
dictionary.get(AUTOBOOTSTRAP_MODE).toString().equalsIgnoreCase("true");
@@ -123,11 +123,15 @@
if (m_rpcAddress.isEmpty()) {
m_rpcAddress = dictionary.get(LISTEN_ADDRESS).toString();
}
- m_rpcPort = Integer.parseInt(dictionary.get(RPC_PORT).toString());
- m_storagePort =
Integer.parseInt(dictionary.get(STORAGE_PORT).toString());
+ m_rpcPort = toInt(dictionary.get(RPC_PORT));
+ m_storagePort = toInt(dictionary.get(STORAGE_PORT));
m_clusterName = dictionary.get(CLUSTER_NAME).toString();
}
}
+
+ private int toInt(Object property) {
+ return Integer.parseInt(property.toString().trim());
+ }
private File relativeToAbsolute(String workDir) {
File file = new File(workDir);
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
