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

[adrianc]

Author: adrianc
Date: Mon Jul 21 10:19:54 2014
New Revision: 1612229

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

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

Modified: ofbiz/branches/release11.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?rev=1612229&r1=1612228&r2=1612229&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java (original)
+++ ofbiz/branches/release11.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java Mon Jul 21 10:19:54 2014
@@ -137,7 +137,10 @@ public class Iterate extends MethodOpera
                 }
             }
         } else {
-            if (Debug.infoOn()) Debug.logInfo("List not found with name " + listAcsr + ", doing nothing: " + rawString(), module);
+            if (Debug.verboseOn()) {
+                Debug.logVerbose("Cannot iterate over a " + objList == null ? "null object" : objList.getClass().getName()
+                        + ", doing nothing: " + this, module);
+            }
             return true;
         }
         entryAcsr.put(methodContext, oldEntryValue);