svn commit: r1814902 - /ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java

[jl...@apache.org]

Author: jleroux
Date: Fri Nov 10 18:52:36 2017
New Revision: 1814902

URL: http://svn.apache.org/viewvc?rev=1814902&view=rev
Log:
Improved: CSS files defined through layoutSettings in GlobalActions are loaded 
twice
(OFBIZ-9770)

GlobalActions screen of themes/common/widget/CommonScreens.xml is loaded twice.
1. Included in GlobalDecorator screen of themes/common/widget/CommonScreens.xml
2. Included in GlobalActions screen of framework/common/widget/CommonScreens.xml
Solution: removes the first instance i.e. from GlobalDecorator.

Steps to verify:
All the files (js, css etc) included in this screen are still available.

Thanks: Aditya for the patch et Aishwary Shrivastava for testing

Modified:
    ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java

Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java?rev=1814902&r1=1814901&r2=1814902&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java Fri Nov 10 18:52:36 2017
@@ -388,7 +388,7 @@ public class FrameImage {
             File file = new File(imageServerPath + "/preview/" +"/previewImage.jpg");
             file.delete();
             // Image Frame
-            BufferedImage bufImg1 = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + imageName).getCanonicalFile());
+            BufferedImage bufImg1 = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + imageName).getCanonicalFile()); // About Findbugs results, see OFBIZ-9973
             BufferedImage bufImg2 = ImageIO.read(new File(imageServerPath + "/frame/" + frameImageName));
             
             int bufImgType;