Author: pierre
Date: 2010-02-17 16:30:49 +0100 (Wed, 17 Feb 2010)
New Revision: 41114
Modified:
mmbase/branches/MMBase-1_9/applications/editwizard/src/main/java/org/mmbase/applications/editwizard/Config.java
Log:
MMB-1938
Modified:
mmbase/branches/MMBase-1_9/applications/editwizard/src/main/java/org/mmbase/applications/editwizard/Config.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/editwizard/src/main/java/org/mmbase/applications/editwizard/Config.java
2010-02-17 15:25:49 UTC (rev 41113)
+++
mmbase/branches/MMBase-1_9/applications/editwizard/src/main/java/org/mmbase/applications/editwizard/Config.java
2010-02-17 15:30:49 UTC (rev 41114)
@@ -61,17 +61,10 @@
/**
* @since MMBase-1.8.1
*/
- private static final UtilReader reader = new UtilReader(CONFIG_FILE,
- new Runnable() {
- public void run() {
-
readConfiguration(reader.getProperties());
- }
- });
- static {
- readConfiguration(reader.getProperties());
- }
+ private static UtilReader reader = null;
synchronized static void readConfiguration(Map configuration) {
+ log.info ("READ EDITWIZARD:" + configuration);
String tmp = (String) configuration.get("wizardStyleSheet");
if (tmp != null && !tmp.equals("")) {
wizardStyleSheet = tmp;
@@ -120,8 +113,19 @@
*/
protected Map<String, Object> attributes;
+ public Config() {
+ // create the reader when it is needed
+ // This prevents race conditions
+ if (reader == null) {
+ reader = new UtilReader(CONFIG_FILE, new Runnable() {
+ public void run() {
+ readConfiguration(reader.getProperties());
+ }
+ });
+ readConfiguration(reader.getProperties());
+ }
+ }
-
// public String context; (contained in attributes now)
static public class SubConfig implements java.io.Serializable {
@@ -177,7 +181,6 @@
Map<String, Object> attributeMap = new HashMap<String,
Object>(attributes);
return attributeMap;
}
-
}
static public class WizardConfig extends SubConfig {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
