accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [06/50] [abbrv] accumulo git commit: ACCUMULO-3167 Avoid empty lines in our host files as well commented lines
Date Tue, 02 Dec 2014 20:36:54 GMT
ACCUMULO-3167 Avoid empty lines in our host files as well commented lines


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a16b7afd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a16b7afd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a16b7afd

Branch: refs/heads/metrics2
Commit: a16b7afd070ac4fcb8beaa098cf2316e66b349cc
Parents: 7e52f7b
Author: Josh Elser <elserj@apache.org>
Authored: Thu Nov 20 23:27:57 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Nov 24 18:08:17 2014 -0500

----------------------------------------------------------------------
 .../accumulo/cluster/standalone/StandaloneClusterControl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a16b7afd/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 70c8f28..f3f311c 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -293,7 +293,8 @@ public class StandaloneClusterControl implements ClusterControl {
       List<String> hosts = new ArrayList<String>();
       String line = null;
       while ((line = reader.readLine()) != null) {
-        if (!line.trim().startsWith("#")) {
+        line = line.trim();
+        if (!line.isEmpty() && !line.startsWith("#")) {
           hosts.add(line);
         }
       }


Mime
View raw message