This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 0ba7036f145773784887bc71cac59bb4f6dc74e6 Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Fri Nov 19 10:04:02 2021 +0100 Fixed: Fix some bugs Spotbugs reports (OFBIZ-12386) Manually handled issues after cherry pick --- .../src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java | 4 ++-- .../src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java index 03475a4..8b9549b 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java @@ -206,7 +206,7 @@ public class VisitHandler { public static GenericValue getVisitor(HttpServletRequest request, HttpServletResponse response) { // this defaults to true: ie if anything but "false" it will be true - Delegator delegator = (Delegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (!EntityUtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist.visitor", "false", delegator)) { HttpSession session = request.getSession(); @@ -228,7 +228,7 @@ public class VisitHandler { String cookieVisitorId = null; Cookie[] cookies = request.getCookies(); if (Debug.verboseOn()) { - Debug.logVerbose("Cookies:" + String.join(",", Arrays.stream(cookies).toArray(String[]::new)), MODULE); + Debug.logVerbose("Cookies:" + String.join(",", Arrays.stream(cookies).toArray(String[]::new)), module); } if (cookies != null) { for (int i = 0; i < cookies.length; i++) { diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java index 1e45dfc..6807f31 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java @@ -43,8 +43,8 @@ public final class UtilCacheEvents { private static final String ERR_RESOURCE = "WebtoolsErrorUiLabels"; private static final String MODULE = UtilCacheEvents.class.getName(); - - private UtilCacheEvents() { } + private UtilCacheEvents() { + } /** An HTTP WebEvent handler the specified element from the specified cache * @param request The HTTP request object for the current JSP or Servlet request. @@ -270,7 +270,6 @@ public final class UtilCacheEvents { Debug.logError(e, MODULE); } - UtilCache<?, ?> utilCache = UtilCache.findCache(name); if (utilCache != null) {