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 2022/10/18 12:17:33 UTC
[ofbiz-framework] branch release22.01 updated (a7637037cc -> ae7466be30)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from a7637037cc Fixed: EntityPerformanceTest.groovy shows error in log (OFBIZ-12706)
new cb3fe2610d Fixed: EntityPerformanceTest.groovy shows error in log (OFBIZ-12706)
new ae7466be30 Fixed: EntityPerformanceTest.groovy shows error in log (OFBIZ-12706)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/ofbiz/base/util/cache/UtilCache.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
[ofbiz-framework] 01/02: Fixed: EntityPerformanceTest.groovy shows error in log (OFBIZ-12706)
Posted by 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 cb3fe2610d1d991f00b17a8b174016aeac66e951
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Tue Oct 18 14:14:41 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
---
.../apache/ofbiz/base/util/cache/UtilCache.java | 23 +++++++++++-----------
1 file changed, 12 insertions(+), 11 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 be969effab..caa29bb845 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
@@ -152,21 +152,22 @@ public final class UtilCache<K, V> implements Serializable, EvictionListener<Obj
private static String getPropertyParam(ResourceBundle res, String[] propNames, String parameter) {
if (!Stream.of(propNames).anyMatch(string -> string == null || string.isEmpty())) {
- try {
- for (String propName : propNames) {
- String key = propName.concat(".").concat(parameter);
- if (res.containsKey(key)) {
- try {
- return res.getString(key);
- } catch (MissingResourceException e) {
+ try {
+ for (String propName : propNames) {
+ String key = propName.concat(".").concat(parameter);
+ if (res.containsKey(key)) {
+ try {
+ return res.getString(key);
+ } catch (MissingResourceException e) {
+ }
}
}
+ } catch (Exception e) {
+ Debug.logWarning(e, "Error getting " + parameter + " value from ResourceBundle for propNames: " + Arrays.toString(propNames), MODULE);
}
- } catch (Exception e) {
- 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});
[ofbiz-framework] 02/02: Fixed: EntityPerformanceTest.groovy shows error in log (OFBIZ-12706)
Posted by 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});