Skip comments in TCPPING.initial_hosts_file's contents

belaban · Jan 10, 2025 · 79ac5a2 · 79ac5a2
1 parent 57c1f93
commit 79ac5a2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/org/jgroups/protocols/TCPPING.java b/src/org/jgroups/protocols/TCPPING.java
@@ -151,7 +151,7 @@ public void init() throws Exception {
                 try(InputStream input=Util.getResourceAsStream(initial_hosts_file, getClass())) {
                     if(input == null)
                         throw new IllegalArgumentException(String.format("initial_hosts_file '%s' not found", initial_hosts_file));
-                    initial_hosts_str=Util.readContents(input);
+                    initial_hosts_str=Util.readContents(input, '#');
                 }
             }
 

diff --git a/src/org/jgroups/util/Util.java b/src/org/jgroups/util/Util.java
@@ -2054,13 +2054,22 @@ public static String readFile(String filename) throws FileNotFoundException {
 
 
     public static String readContents(InputStream input) {
+        return readContents(input, (char)0);
+    }
+
+    public static String readContents(InputStream input, char comment) {
         StringBuilder sb=new StringBuilder();
         int ch;
         while(true) {
             try {
                 ch=input.read();
-                if(ch != -1)
+                if(ch != -1) {
+                    if(comment != 0 && comment == ch) {
+                        skipUntilEndOfLine(input);
+                        continue;
+                    }
                     sb.append((char)ch);
+                }
                 else
                     break;
             }
@@ -2071,6 +2080,21 @@ public static String readContents(InputStream input) {
         return sb.toString();
     }
 
+    protected static void skipUntilEndOfLine(InputStream input) {
+        for(;;) {
+            try {
+                int ch=input.read();
+                if(ch == -1)
+                    break;
+                if(ch == '\n' || ch == '\r')
+                    break;
+            }
+            catch(IOException e) {
+                break;
+            }
+        }
+    }
+
     public static byte[] readFileContents(InputStream input) throws IOException {
         byte[] contents=new byte[10000];
         byte[] buf=new byte[1024];