[ofbiz-framework] branch trunk updated: Improved: 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 21ebebc  Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)
21ebebc is described below

commit 21ebebc063e025bc2a7c67a08454c98ec386f462
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Dec 26 14:52:37 2021 +0100

    Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)
    
    Adds a null check at GenericMapValues::equals
---
 .../java/org/apache/ofbiz/base/util/collections/GenericMapValues.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
 
b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
index 947cd71..3a6e70c 100644
--- 
a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
+++ 
b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
@@ -43,6 +43,9 @@ public abstract class GenericMapValues<K, V, M extends Map<K, 
V>> extends Generi
 
     @Override
     public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
         if (!(o instanceof Collection<?>)) {
             return false;
         }