[ofbiz-framework] branch trunk updated: 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


The following commit(s) were added to refs/heads/trunk by this push:
     new 4d9d191  Fixed: Fix some bugs Spotbugs reports (OFBIZ-12386)
4d9d191 is described below

commit 4d9d191dfdf249411f39877664557f53cd86ba31
Author: Jacques Le Roux <jacques.le.r...@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 7fc00db..9e86b50 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
@@ -236,9 +236,8 @@ public abstract class FlexibleStringExpander implements 
Serializable, IsEmpty {
     private abstract static 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 bfdfafc..757724c 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
@@ -156,7 +156,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) {