[ofbiz-framework] 02/03: Fixed: Fix some bugs Spotbugs reports (OFBIZ-12386)

[jleroux]

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

commit 59dd94607837cf55004cde6c0328e9f83649f219
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu Nov 18 17:08:12 2021 +0100

    Fixed: Fix some bugs Spotbugs reports (OFBIZ-12386)
    
    Fixes a Spotbugs worry and simplifies code
---
 .../ofbiz/webapp/ftl/OfbizScreenTransform.java     | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
index 6ec47c8..caa1af2 100644
--- 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
+++ 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
@@ -18,18 +18,14 @@
  
*******************************************************************************/
 package org.apache.ofbiz.webapp.ftl;
 
-import freemarker.core.Environment;
-import freemarker.ext.beans.BeanModel;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateTransformModel;
-import freemarker.template.TemplateScalarModel;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.ofbiz.base.util.Debug;
 import org.apache.ofbiz.base.util.GeneralException;
 import org.apache.ofbiz.base.util.UtilGenerics;
@@ -43,6 +39,13 @@ import org.apache.ofbiz.widget.renderer.VisualTheme;
 import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer;
 import org.xml.sax.SAXException;
 
+import freemarker.core.Environment;
+import freemarker.ext.beans.BeanModel;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateScalarModel;
+import freemarker.template.TemplateTransformModel;
+
 /**
  * OfbizScreenTransform - Freemarker Transform to display a screen by is 
location and name
  *
@@ -108,12 +111,13 @@ public class OfbizScreenTransform implements 
TemplateTransformModel {
                 try {
                     Environment env = Environment.getCurrentEnvironment();
                     BeanModel req = (BeanModel) env.getVariable("request");
-                    HttpServletRequest request = req == null ? null : 
(HttpServletRequest) req.getWrappedObject();
+                    if (req == null) {
+                        return;
+                    }
+                    HttpServletRequest request = (HttpServletRequest) 
req.getWrappedObject();
                     VisualTheme visualTheme = UtilHttp.getVisualTheme(request);
                     ModelTheme modelTheme = visualTheme.getModelTheme();
-
                     String screenName = name.isEmpty() ? buf.toString() : name;
-
                     String screenMacroLibraryPath = 
modelTheme.getScreenRendererLocation(screenType);
                     ScreenStringRenderer screenStringRenderer = new 
MacroScreenRenderer(modelTheme.getType(screenType), screenMacroLibraryPath);