You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2014/07/21 10:07:48 UTC
svn commit: r1612206 -
/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
Author: adrianc
Date: Mon Jul 21 08:07:47 2014
New Revision: 1612206
URL: http://svn.apache.org/r1612206
Log:
Merged revision(s) 1612205 from ofbiz/trunk:
Fixed a bug in Mini-Language where a NPE could be thrown while using Verbose logging: https://issues.apache.org/jira/browse/OFBIZ-5689.
Modified:
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
Modified: ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?rev=1612206&r1=1612205&r2=1612206&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java Mon Jul 21 08:07:47 2014
@@ -155,8 +155,10 @@ public final class Iterate extends Metho
}
}
} else {
- if (Debug.verboseOn())
- Debug.logVerbose("Cannot iterate over a " + objList.getClass().getName() + ", doing nothing: " + this, module);
+ if (Debug.verboseOn()) {
+ Debug.logVerbose("Cannot iterate over a " + objList == null ? "null object" : objList.getClass().getName()
+ + ", doing nothing: " + this, module);
+ }
return true;
}
entryFma.put(methodContext.getEnvMap(), oldEntryValue);