From 2b6de085104af3a4b4e1819decc2f634ec3bc2aa Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 29 Aug 2012 23:17:37 -0500
Subject: [PATCH] IDEMPIERE-194 Handling null context variable / Thanks to
 Nicolas Micoud

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

diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java
index 39417ddaee..f47e9d104d 100644
--- a/org.adempiere.base/src/org/compiere/util/Env.java
+++ b/org.adempiere.base/src/org/compiere/util/Env.java
@@ -1328,9 +1328,22 @@ public final class Env
 
 			token = inStr.substring(0, j);
 
+			// IDEMPIERE-194 Handling null context variable
+			String defaultV = null;
+			int idx = token.indexOf(":");	//	or clause
+			if (idx  >=  0) 
+			{
+				defaultV = token.substring(idx+1, token.length());
+				token = token.substring(0, idx);
+			}
+
 			String ctxInfo = getContext(ctx, WindowNo, token, onlyWindow);	// get context
 			if (ctxInfo.length() == 0 && (token.startsWith("#") || token.startsWith("$")) )
 				ctxInfo = getContext(ctx, token);	// get global context
+
+			if (ctxInfo.length() == 0 && defaultV != null)
+				ctxInfo = defaultV;
+
 			if (ctxInfo.length() == 0)
 			{
 				getLogger().config("No Context Win=" + WindowNo + " for: " + token);