You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/08/12 16:31:27 UTC
svn commit: r1617489 - in /ofbiz/branches/release13.07: ./
framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java
Author: jacopoc
Date: Tue Aug 12 14:31:26 2014
New Revision: 1617489
URL: http://svn.apache.org/r1617489
Log:
Applied fix from trunk for revision: 1617480
===
Fix for a typo and an important optimization: enabled cache lookup for the retrieval of SystemProperty records.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1617480
Modified: ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java?rev=1617489&r1=1617488&r2=1617489&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java (original)
+++ ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntityUtilProperties.java Tue Aug 12 14:31:26 2014
@@ -55,15 +55,15 @@ public class EntityUtilProperties implem
// find system property
try {
- GenericValue systemProperty = delegator.findOne("SystemProperty", UtilMisc.toMap("systemResourceId", resource, "systemPropertyId", name), false);
- if (UtilValidate.isNotEmpty(systemProperty)) {
+ GenericValue systemProperty = delegator.findOne("SystemProperty", UtilMisc.toMap("systemResourceId", resource, "systemPropertyId", name), true);
+ if (systemProperty != null) {
String systemPropertyValue = systemProperty.getString("systemPropertyValue");
if (UtilValidate.isNotEmpty(systemPropertyValue)) {
return systemPropertyValue;
}
}
} catch (Exception e) {
- Debug.logWarning("Could not get a sytem property for " + name + " : " + e.getMessage(), module);
+ Debug.logWarning("Could not get a system property for " + name + " : " + e.getMessage(), module);
}
return null;
}