[OFBiz] SVN: r5924 - trunk/applications/product/src/org/ofbiz/product/store

[sichen at svn.ofbiz.org]

Author: sichen
Date: 2005-10-06 19:04:42 -0500 (Thu, 06 Oct 2005)
New Revision: 5924

Modified:
   trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
Log:
Added checking of virtual product Ids when looking for applicable surveys

Modified: trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
===================================================================
--- trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java	2005-10-06 21:29:39 UTC (rev 5923)
+++ trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java	2005-10-07 00:04:42 UTC (rev 5924)
@@ -475,7 +475,7 @@
                 if (surveyAppl.get("productId") != null) {
                     if (surveyAppl.get("productId").equals(productId)) {
                         surveys.add(surveyAppl);
-                    } else if (surveyAppl.getString("productId").equals(virtualProductId)) {
+                    } else if ((virtualProductId != null) && (surveyAppl.getString("productId").equals(virtualProductId))) {
                         surveys.add(surveyAppl);    
                     }
                 } else if (surveyAppl.get("productCategoryId") != null) {