You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2019/01/10 06:10:00 UTC
svn commit: r1850920 - in /ofbiz/ofbiz-framework/branches/release18.12: ./
applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
Author: deepak
Date: Thu Jan 10 06:10:00 2019
New Revision: 1850920
URL: http://svn.apache.org/viewvc?rev=1850920&view=rev
Log:
Applied fix from trunk for revision: 1850918
===
Fixed: Unable to add additional product images from catalog
(OFBIZ-10673)
Removed code that was unused after r1081272, as logic to prepare the fileLocation was modified at r1081272
Thanks Rohit Koushal and Ingo Wolfmayr for your contribution
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 10 06:10:00 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850918
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java?rev=1850920&r1=1850919&r2=1850920&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java Thu Jan 10 06:10:00 2019
@@ -138,10 +138,6 @@ public class ScaleImage {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductImageViewType", UtilMisc.toMap("viewType", viewType), locale));
}
- if (fileLocation.lastIndexOf('/') != -1) {
- fileLocation = fileLocation.substring(0, fileLocation.lastIndexOf('/') + 1); // adding 1 to include the trailing slash
- }
-
/* get original BUFFERED IMAGE */
resultBufImgMap.putAll(ImageTransform.getBufferedImage(imageServerPath + "/" + fileLocation + "." + imgExtension, locale));