svn commit: r1612214 - in /ofbiz/branches/release12.04: ./ framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java

[adrianc]

Author: adrianc
Date: Mon Jul 21 09:35:29 2014
New Revision: 1612214

URL: http://svn.apache.org/r1612214
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/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1612205

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?rev=1612214&r1=1612213&r2=1612214&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java Mon Jul 21 09:35:29 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);