Author: jleroux
Date: Sat Oct 19 12:02:03 2013
New Revision: 1533736
URL: http://svn.apache.org/r1533736
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/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1529412
Modified:
ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java?rev=1533736&r1=1533735&r2=1533736&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java
(original)
+++
ofbiz/branches/release13.07/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementHelper.java
Sat Oct 19 12:02:03 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"), false);
