IDEMPIERE-3472 Env.parseVariable not keeping unparseable variable / thanks to Ricardo Santana (ralexsander)

2017-09-08 15:19:38 +02:00 · 2017-09-08 15:19:38 +02:00 · f74f08c521
parent 14faeeec5c
commit f74f08c521
1 changed files with 8 additions and 1 deletions
--- a/org.adempiere.base/src/org/compiere/util/Env.java
+++ b/org.adempiere.base/src/org/compiere/util/Env.java
@ -1673,7 +1673,14 @@ public final class Env
 					outStr.append("@");
 				}
 			}
-
+			else if (keepUnparseable)
+			{
+				outStr.append("@"+token);
+				if (format.length() > 0)
+					outStr.append("<"+format+">");
+				outStr.append("@");
+			}
+			
 			inStr = inStr.substring(j+1, inStr.length());	// from second @
 			i = inStr.indexOf('@');
 		}