[ofbiz-framework] branch trunk updated: Improved: Misc trivial changes done while working on others issues

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2fe76be  Improved: Misc trivial changes done while working on others issues
2fe76be is described below

commit 2fe76bead8bdd97ad465a9afa6dcb452a27f5f7a
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Wed Nov 11 20:43:59 2020 +0100

    Improved: Misc trivial changes done while working on others issues
---
 applications/content/servicedef/services_content.xml                | 2 +-
 .../org/apache/ofbiz/content/content/UploadContentAndImage.java     | 4 ----
 applications/product/config/ImageProperties.xml                     | 6 +++---
 .../base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java     | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/applications/content/servicedef/services_content.xml b/applications/content/servicedef/services_content.xml
index 2719d11..e03ce6c 100644
--- a/applications/content/servicedef/services_content.xml
+++ b/applications/content/servicedef/services_content.xml
@@ -95,7 +95,7 @@
 
     <service name="createContentFromUploadedFile" engine="group" transaction-timeout="300">
         <description>Accepts file upload, creates DataResource and Content records.</description>
-        <!-- uses createContent internally; additonal permission(s) not necessary -->
+        <!-- uses createContent internally; additional permission(s) not necessary -->
         <group>
             <invoke name="createDataResource" parameters="preserve" result-to-context="true"/>
             <invoke name="attachUploadToDataResource" parameters="preserve" result-to-context="true"/>
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java
index c8ae808..420683a 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java
@@ -526,8 +526,6 @@ public class UploadContentAndImage {
             List<String> errorMsgList = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_"));
             if (Debug.infoOn()) {
                 Debug.logInfo("[UploadContentStuff]errorMsgList:" + errorMsgList, MODULE);
-            }
-            if (Debug.infoOn()) {
                 Debug.logInfo("[UploadContentStuff]msg:" + msg, MODULE);
             }
             if (errorMsgList == null) {
@@ -579,8 +577,6 @@ public class UploadContentAndImage {
                 List<String> errorMsgList = UtilGenerics.cast(request.getAttribute("_EVENT_MESSAGE_LIST_"));
                 if (Debug.infoOn()) {
                     Debug.logInfo("[UploadContentStuff]errorMsgList:" + errorMsgList, MODULE);
-                }
-                if (Debug.infoOn()) {
                     Debug.logInfo("[UploadContentStuff]msg:" + msg, MODULE);
                 }
                 if (errorMsgList == null) {
diff --git a/applications/product/config/ImageProperties.xml b/applications/product/config/ImageProperties.xml
index 025bf5f..eb82191 100644
--- a/applications/product/config/ImageProperties.xml
+++ b/applications/product/config/ImageProperties.xml
@@ -18,9 +18,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<!--
-    # The uploaded image is scaled in each size tye , you can descrease or increase size types ; size type name doesn't have to contain space
-    # Just one configured dimension on two is allowed to restrict just one image dimension, whatever its proportions
+<!--
+    # The uploaded image is scaled in each size type , you can decrease or increase size types ; size type name doesn't have to contain space
+    # Just one configured dimension on two is allowed to restrict just one image dimension, whatever its proportions
 -->
 <imageSize xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <size name="small">
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
index 721b726..45e0f9c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
@@ -901,7 +901,7 @@ public final class UtilHttp {
     /**
      * Return the VisualTheme object from the user session
      * @param request
-     * @return
+     * @return VisualTheme
      */
     public static VisualTheme getVisualTheme(HttpServletRequest request) {
         return (VisualTheme) request.getSession().getAttribute(SESSION_KEY_THEME);