prevent loop in Envirnoment.get

jpos · Jan 1, 2022 · c27ebd1 · c27ebd1
1 parent 67e4ee4
commit c27ebd1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/jpos/src/main/java/org/jpos/core/Environment.java b/jpos/src/main/java/org/jpos/core/Environment.java
@@ -127,6 +127,7 @@ public String getProperty (String s) {
                 return s;                           // return the whole thing
 
             while (m != null && m.matches()) {
+                String previousR = r;
                 String gPrefix = m.group(3);
                 String gValue = m.group(4);
                 gPrefix = gPrefix != null ? gPrefix : "";
@@ -173,6 +174,9 @@ public String getProperty (String s) {
                 }
                 else
                     m = null;
+
+                if (Objects.equals(r, previousR))
+                    break;
             }
         }
         return r;

diff --git a/jpos/src/test/java/org/jpos/core/EnvironmentTest.java b/jpos/src/test/java/org/jpos/core/EnvironmentTest.java
@@ -83,4 +83,10 @@ public void testObfuscated() {
         System.setProperty("obf.value", "obf::D4sCOgAAAASneiqWUPCruOtNmAU78cg6uBAv3N0/8DSNK6ptaozLAg==");
         assertEquals("OBFUSCATED ABCD", Environment.get("OBFUSCATED ${obf.value}"));
     }
+
+    @Test
+    public void testLoop() {
+        System.setProperty("loop", "${loop}");
+        assertEquals("${loop}", Environment.get("${loop}"));
+    }
 }