From 61229b3277ca951bd2cb9fa07409af491c1b0f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Tak=C3=A1cs?=
 <93127072+PeterTakacs300@users.noreply.github.com>
Date: Tue, 6 Aug 2024 10:31:33 +0200
Subject: [PATCH] IDEMPIERE-6204 - Env.parseVariable returns wrong parsed
 message if default value is used (#2431)

---
 org.adempiere.base/src/org/compiere/util/Env.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java
index 5dd3ca61d5..06cc57f6d4 100644
--- a/org.adempiere.base/src/org/compiere/util/Env.java
+++ b/org.adempiere.base/src/org/compiere/util/Env.java
@@ -1738,6 +1738,8 @@ public final class Env
 					outStr.append("@").append(token);
 					if (!Util.isEmpty(format))
 						outStr.append("<").append(format).append(">");
+					if (!Util.isEmpty(defaultValue))
+	                    outStr.append(":").append(defaultValue);
 					outStr.append("@");
 				}
 			} else if (po != null && token.startsWith("=")) {
@@ -1759,6 +1761,8 @@ public final class Env
 						outStr.append("@").append(token);
 						if (!Util.isEmpty(format))
 							outStr.append("<").append(format).append(">");
+						if (!Util.isEmpty(defaultValue))
+		                    outStr.append(":").append(defaultValue);
 						outStr.append("@");
 					}
 				}
@@ -1776,6 +1780,8 @@ public final class Env
 					outStr.append("@").append(token);
 					if (!Util.isEmpty(format))
 						outStr.append("<").append(format).append(">");
+					if (!Util.isEmpty(defaultValue))
+	                    outStr.append(":").append(defaultValue);
 					outStr.append("@");
 				}
 			}