You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2021/11/19 09:16:46 UTC

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

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 1feb709998d08f0c4cf2ad684bff080e711cd80a
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Nov 18 08:06:50 2021 +0100

    Fixed: Fix some bugs Spotbugs reports (OFBIZ-12386)
    
    Need to check for null before return
---
 .../org/apache/ofbiz/base/util/string/FlexibleStringExpander.java    | 5 ++---
 .../src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
index 03f4a95..7268206 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
@@ -241,9 +241,8 @@ public abstract class FlexibleStringExpander implements Serializable, IsEmpty {
     private static abstract class Key {
         @Override
         public final boolean equals(Object o) {
-            // No class test here, nor null, as this class is only used
-            // internally
-            return toString().equals(o.toString());
+            // No class test here, nor null, as this class is only used internally
+            return (o == null) ? false : toString().equals(o.toString());
         }
 
         @Override
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
index 7e3f258..3476781 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
@@ -154,7 +154,7 @@ public final class ServiceEcaUtil {
 
     public static Map<String, List<ServiceEcaRule>> getServiceEventMap(String serviceName) {
         if (ServiceEcaUtil.ecaCache == null) ServiceEcaUtil.readConfig();
-        return ServiceEcaUtil.ecaCache.get(serviceName);
+        return (serviceName == null) ? null : ServiceEcaUtil.ecaCache.get(serviceName);
     }
 
     public static List<ServiceEcaRule> getServiceEventRules(String serviceName, String event) {