[ofbiz-framework] 02/02: Fixed: EntityPerformanceTest.groovy shows error in log (OFBIZ-12706)

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit ae7466be30bf803637210aff90bbf93966150b27
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Tue Oct 18 14:16:43 2022 +0200

    Fixed: EntityPerformanceTest.groovy shows error in log (OFBIZ-12706)
    
    In previous commit:
    "Conflict handled by hand" but merge did not went so well, this fixes it
---
 .../src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
index caa29bb845..40ae29dd6f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
@@ -166,8 +166,8 @@ public final class UtilCache<K, V> implements Serializable, EvictionListener<Obj
                 Debug.logWarning(e, "Error getting " + parameter + " value from ResourceBundle for propNames: " + Arrays.toString(propNames), MODULE);
             }
         }
-            return null;
-        }
+        return null;
+    }
 
     protected void setPropertiesParams(String cacheName) {
         setPropertiesParams(new String[] {cacheName});