ZOOKEEPER-192. trailing whitespace in config file can cause number format exceptions

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@777658 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -96,6 +96,8 @@ BUGFIXES:
 
   ZOOKEEPER-385. crctest failed on hudson patch test (mahadev via phunt)
 
+  ZOOKEEPER-192.  trailing whitespace in config file can cause number format exceptions (phunt via breed)
+
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   (breed via mahadev)

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java

@@ -103,8 +103,8 @@ public class QuorumPeerConfig {
     protected void parseProperties(Properties zkProp)
     throws IOException, ConfigException {
         for (Entry<Object, Object> entry : zkProp.entrySet()) {
-            String key = entry.getKey().toString();
-            String value = entry.getValue().toString();
+            String key = entry.getKey().toString().trim();
+            String value = entry.getValue().toString().trim();
             if (key.equals("dataDir")) {
                 dataDir = value;
             } else if (key.equals("dataLogDir")) {