Fixed incorrect variable substitution (https://issues.redhat.com/brow…

…se/JGRP-2815)
belaban · Aug 2, 2024 · c3c57c1 · c3c57c1
1 parent 2a5480e
commit c3c57c1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/org/jgroups/conf/ProtocolConfiguration.java b/src/org/jgroups/conf/ProtocolConfiguration.java
@@ -115,6 +115,8 @@ public void substituteVariables() {
                 String replacement=Util.substituteVariable(val);
                 if(replacement != null)
                     properties.put(key, replacement);
+                else
+                    it.remove();
             }
         }
         properties_str=propertiesToString();

diff --git a/src/org/jgroups/util/Util.java b/src/org/jgroups/util/Util.java
@@ -4997,7 +4997,7 @@ public static String substituteVariable(String input, Properties p) {
         }
         if(cache != null)
             sb.append(cache);
-        return sb.toString();
+        return sb.length() == 0? null : sb.toString();
     }
 
     protected static char nextChar(String s, int index) {

diff --git a/tests/junit-functional/org/jgroups/tests/UtilTest.java b/tests/junit-functional/org/jgroups/tests/UtilTest.java
@@ -1277,6 +1277,10 @@ public void testVariableSubstitution() {
         val="hello ${name and end";
         replacement=Util.substituteVariable(val);
         assert val.equals(replacement);
+
+        val="${hello.world}";
+        replacement=Util.substituteVariable(val);
+        assert replacement == null;
     }