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 2012/05/29 18:18:03 UTC
svn commit: r1343815 - in /ofbiz/trunk/framework:
base/src/org/ofbiz/base/util/ datafile/src/org/ofbiz/datafile/
security/src/org/ofbiz/security/authz/da/
service/src/org/ofbiz/service/mail/ widget/src/org/ofbiz/widget/screen/
Author: jacopoc
Date: Tue May 29 16:18:02 2012
New Revision: 1343815
URL: http://svn.apache.org/viewvc?rev=1343815&view=rev
Log:
Improved code that manages the cache:
* protected some UtilCache objects (static fields) by making them private and final
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java
ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFileReader.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java?rev=1343815&r1=1343814&r2=1343815&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java Tue May 29 16:18:02 2012
@@ -33,7 +33,7 @@ public class CompilerMatcher {
public static final String module = CompilerMatcher.class.getName();
- public static UtilCache<String, Pattern> compiledPatterns = UtilCache.createUtilCache("regularExpression.compiledPatterns", false);
+ private static final UtilCache<String, Pattern> compiledPatterns = UtilCache.createUtilCache("regularExpression.compiledPatterns", false);
private Perl5Compiler compiler = new Perl5Compiler();
private Perl5Matcher matcher = new Perl5Matcher();
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java?rev=1343815&r1=1343814&r2=1343815&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java Tue May 29 16:18:02 2012
@@ -46,7 +46,7 @@ public class GroovyUtil {
public static final String module = GroovyUtil.class.getName();
- public static UtilCache<String, Class<?>> parsedScripts = UtilCache.createUtilCache("script.GroovyLocationParsedCache", 0, 0, false);
+ private static final UtilCache<String, Class<?>> parsedScripts = UtilCache.createUtilCache("script.GroovyLocationParsedCache", 0, 0, false);
/**
* Evaluate a Groovy condition or expression
Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFileReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFileReader.java?rev=1343815&r1=1343814&r2=1343815&view=diff
==============================================================================
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFileReader.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFileReader.java Tue May 29 16:18:02 2012
@@ -41,7 +41,7 @@ import org.w3c.dom.NodeList;
public final class ModelDataFileReader {
public static final String module = ModelDataFileReader.class.getName();
- private static UtilCache<URL, ModelDataFileReader> readers = UtilCache.createUtilCache("ModelDataFile", true);
+ private static final UtilCache<URL, ModelDataFileReader> readers = UtilCache.createUtilCache("ModelDataFile", true);
public static ModelDataFileReader getModelDataFileReader(URL readerURL) throws DataFileException {
ModelDataFileReader reader = readers.get(readerURL);
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java?rev=1343815&r1=1343814&r2=1343815&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java Tue May 29 16:18:02 2012
@@ -34,7 +34,7 @@ public class DynamicAccessFactory {
/**
* Cache to store the DynamicAccess implementations
*/
- private static UtilCache<String,DynamicAccessHandler> dynamicAccessHandlerCache = UtilCache.createUtilCache("security.DynamicAccessHandlerCache");
+ private static final UtilCache<String,DynamicAccessHandler> dynamicAccessHandlerCache = UtilCache.createUtilCache("security.DynamicAccessHandlerCache");
private static final String module = DynamicAccessFactory.class.getName();
public static DynamicAccessHandler getDynamicAccessHandler(Delegator delegator, String accessString) {
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java?rev=1343815&r1=1343814&r2=1343815&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java Tue May 29 16:18:02 2012
@@ -25,7 +25,7 @@ import org.ofbiz.entity.Delegator;
public class ObjectDaHandler implements DynamicAccessHandler {
- private static UtilCache<String,DynamicAccess> dynamicAccessCache = UtilCache.createUtilCache("security.DynamicAccessCache");
+ private static final UtilCache<String,DynamicAccess> dynamicAccessCache = UtilCache.createUtilCache("security.DynamicAccessCache");
protected Delegator delegator;
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java?rev=1343815&r1=1343814&r2=1343815&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java Tue May 29 16:18:02 2012
@@ -38,7 +38,7 @@ import org.w3c.dom.Element;
public class ServiceMcaUtil {
public static final String module = ServiceMcaUtil.class.getName();
- public static UtilCache<String, ServiceMcaRule> mcaCache = UtilCache.createUtilCache("service.ServiceMCAs", 0, 0, false);
+ private static final UtilCache<String, ServiceMcaRule> mcaCache = UtilCache.createUtilCache("service.ServiceMCAs", 0, 0, false);
public static void reloadConfig() {
mcaCache.clear();
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=1343815&r1=1343814&r2=1343815&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Tue May 29 16:18:02 2012
@@ -57,7 +57,7 @@ import freemarker.template.TemplateModel
public class HtmlWidget extends ModelScreenWidget {
public static final String module = HtmlWidget.class.getName();
- public static UtilCache<String, Template> specialTemplateCache = UtilCache.createUtilCache("widget.screen.template.ftl.general", 0, 0, false);
+ private static final UtilCache<String, Template> specialTemplateCache = UtilCache.createUtilCache("widget.screen.template.ftl.general", 0, 0, false);
protected static Configuration specialConfig = FreeMarkerWorker.makeConfiguration(FreeMarkerWorker.configureBeansWrapper(new ExtendedWrapper()));
// not sure if this is the best way to get FTL to use my fancy MapModel derivative, but should work at least...