svn commit: r1821352 - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java

[lektran]

Author: lektran
Date: Wed Jan 17 09:17:13 2018
New Revision: 1821352

URL: http://svn.apache.org/viewvc?rev=1821352&view=rev
Log:
Improved: Replace while-loop and iterator with an enhanced for-loop and also 
removed an unnecessary isNotEmpty test in 
ProductPromoWorker.getProductStorePromotions(...) 

Modified:
    
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java

Modified: 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1821352&r1=1821351&r2=1821352&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
 Wed Jan 17 09:17:13 2018
@@ -233,10 +233,8 @@ public final class ProductPromoWorker {
                 }
             }
 
-            Iterator<GenericValue> prodCatalogPromoAppls = 
UtilMisc.toIterator(productStorePromoApplsList);
-            while (prodCatalogPromoAppls != null && 
prodCatalogPromoAppls.hasNext()) {
-                GenericValue prodCatalogPromoAppl = 
prodCatalogPromoAppls.next();
-                if 
(UtilValidate.isNotEmpty(prodCatalogPromoAppl.getString("manualOnly")) && 
"Y".equals(prodCatalogPromoAppl.getString("manualOnly"))) {
+            for (GenericValue prodCatalogPromoAppl : 
productStorePromoApplsList) {
+                if ("Y".equals(prodCatalogPromoAppl.getString("manualOnly"))) {
                     // manual only promotions are not automatically evaluated 
(they must be explicitly selected by the user)
                     if (Debug.verboseOn()) {
                         Debug.logVerbose("Skipping promotion with id [" + 
prodCatalogPromoAppl.getString("productPromoId") + "] because it is applied to 
the store with ID " + productStoreId + " as a manual only promotion.", module);