svn commit: r1818556 - /ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java

[mbrohl]

Author: mbrohl
Date: Mon Dec 18 12:01:53 2017
New Revision: 1818556

URL: http://svn.apache.org/viewvc?rev=1818556&view=rev
Log:
Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.image.
(OFBIZ-9878)

Thanks Julian Leichert for reporting and providing the patch.

Modified:
    ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java

Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java?rev=1818556&r1=1818555&r2=1818556&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java Mon Dec 18 12:01:53 2017
@@ -224,12 +224,7 @@ public class ImageTransform {
         /* PARSING */
         try {
             document = UtilXml.readXmlDocument(new FileInputStream(fileFullPath), fileFullPath);
-        } catch (ParserConfigurationException e) {
-            String errMsg = UtilProperties.getMessage(resource, "ImageTransform.errors_occurred_during_parsing", locale) +  " ImageProperties.xml " + e.toString();
-            Debug.logError(errMsg, module);
-            result.put(ModelService.ERROR_MESSAGE, "error");
-            return result;
-        } catch (SAXException e) {
+        } catch (ParserConfigurationException | SAXException e) {
             String errMsg = UtilProperties.getMessage(resource, "ImageTransform.errors_occurred_during_parsing", locale) +  " ImageProperties.xml " + e.toString();
             Debug.logError(errMsg, module);
             result.put(ModelService.ERROR_MESSAGE, "error");