svn commit: r1533737 - in /ofbiz/branches/release12.04: ./ applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java

Author: jleroux
Date: Sat Oct 19 12:02:05 2013
New Revision: 1533737

URL: http://svn.apache.org/r1533737
Log:
"Applied fix from trunk for revision: 1529412"
------------------------------------------------------------------------
r1529412 | jleroux | 2013-10-05 10:39:35 +0200 (sam. 05 oct. 2013) | 1 ligne

When used in the context of sendOrderNotificationScreen there is no request, since it's a job...
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java

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

Modified: ofbiz/branches/release12.04/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java?rev=1533737&r1=1533736&r2=1533737&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java (original)
+++ ofbiz/branches/release12.04/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java Sat Oct 19 12:02:05 2013
@@ -37,6 +37,7 @@ public class ImageManagementHelper {
 
     public static String getInternalImageUrl(HttpServletRequest request, String productId) {
         String internalImageUrl = null;
+        if (request == null) return internalImageUrl;
         try {
             Delegator delegator = (Delegator) request.getAttribute("delegator");
             List<GenericValue> defaultImageList = delegator.findByAnd("ProductContentAndInfo", UtilMisc.toMap("productId", productId, "productContentTypeId", "DEFAULT_IMAGE", "statusId", "IM_APPROVED", "drIsPublic", "N"), UtilMisc.toList("sequenceNum"));