IDEMPIERE-194 Handling null context variable / Thanks to Nicolas Micoud
This commit is contained in:
parent
9f753252e0
commit
2b6de08510
|
@ -1328,9 +1328,22 @@ public final class Env
|
||||||
|
|
||||||
token = inStr.substring(0, j);
|
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
|
String ctxInfo = getContext(ctx, WindowNo, token, onlyWindow); // get context
|
||||||
if (ctxInfo.length() == 0 && (token.startsWith("#") || token.startsWith("$")) )
|
if (ctxInfo.length() == 0 && (token.startsWith("#") || token.startsWith("$")) )
|
||||||
ctxInfo = getContext(ctx, token); // get global context
|
ctxInfo = getContext(ctx, token); // get global context
|
||||||
|
|
||||||
|
if (ctxInfo.length() == 0 && defaultV != null)
|
||||||
|
ctxInfo = defaultV;
|
||||||
|
|
||||||
if (ctxInfo.length() == 0)
|
if (ctxInfo.length() == 0)
|
||||||
{
|
{
|
||||||
getLogger().config("No Context Win=" + WindowNo + " for: " + token);
|
getLogger().config("No Context Win=" + WindowNo + " for: " + token);
|
||||||
|
|
Loading…
Reference in New Issue