From ed9cfba25a157f3aa1a916ed17d0cd1070c986ae Mon Sep 17 00:00:00 2001
From: onetr1ck <64502803+onetr1ck@users.noreply.github.com>
Date: Wed, 7 Jun 2023 14:25:52 +0200
Subject: [PATCH] Added a simple regex based check before expansion.

---
 .../soapui/model/propertyexpansion/PropertyExpander.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/soapui/src/main/java/com/eviware/soapui/model/propertyexpansion/PropertyExpander.java b/soapui/src/main/java/com/eviware/soapui/model/propertyexpansion/PropertyExpander.java
index 7f01f4b10d..929dc0a5de 100644
--- a/soapui/src/main/java/com/eviware/soapui/model/propertyexpansion/PropertyExpander.java
+++ b/soapui/src/main/java/com/eviware/soapui/model/propertyexpansion/PropertyExpander.java
@@ -145,12 +145,14 @@ public String expand(PropertyExpansionContext context, String content) {
         return expand(context, content, false);
     }
 
+    final static String regexPropertyName = "(?<=\\$\\{)[^\\r\\n]+(?=})";
+
     public String expand(PropertyExpansionContext context, String content, boolean entitize) {
         SoapUIClassLoaderState clState = SoapUIExtensionClassLoader.ensure();
 
         try {
 
-            if (StringUtils.isNullOrEmpty(content)) {
+            if (StringUtils.isNullOrEmpty(content) || !content.matches(regexPropertyName)) {
                 return content;
             }