branch develop updated (da41ade -> 6bcd775)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from da41ade refs #1159 lancement de lima-server fonctionnel new 6bcd775 refs #1115 fix Multithreaded correctness - Incorrect lazy initialization and update of static field The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6bcd7753dc5c4e95cde53ab0b1ac2f5b1d3688f2 Author: dcosse <japbiw74> Date: Wed Feb 18 10:23:32 2015 +0100 refs #1115 fix Multithreaded correctness - Incorrect lazy initialization and update of static field Summary of changes: .../src/main/java/org/chorem/lima/business/LimaServiceConfig.java | 2 +- lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 6bcd7753dc5c4e95cde53ab0b1ac2f5b1d3688f2 Author: dcosse <japbiw74> Date: Wed Feb 18 10:23:32 2015 +0100 refs #1115 fix Multithreaded correctness - Incorrect lazy initialization and update of static field --- .../src/main/java/org/chorem/lima/business/LimaServiceConfig.java | 2 +- lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java index 66a079b..c32b43b 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java @@ -120,7 +120,7 @@ public class LimaServiceConfig { this.rootContextProperties = rootContextProperties; } - public static LimaServiceConfig getInstance(String configFileName) { + public synchronized static LimaServiceConfig getInstance(String configFileName) { if (instance == null) { instance= new LimaServiceConfig(configFileName); } diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java index 53d0eba..c38c9a2 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -66,7 +66,7 @@ public class LimaSwingConfig extends ApplicationConfig { public static final Set<Character> NUMBER_SEPARATOR = ImmutableSet.of(' ', ',', '.', ';'); public static final Set<Integer> NUMBER_DECIMALS = ImmutableSet.of(0, 1, 2, 3, 4, 5, 6); - protected static LimaSwingConfig instance; + private static LimaSwingConfig instance; private static final String configFile = "lima-config.properties"; @@ -116,12 +116,11 @@ public class LimaSwingConfig extends ApplicationConfig { addAlias("--disableui", "--launchui false"); } - public static LimaSwingConfig getInstance() { + public synchronized static LimaSwingConfig getInstance() { if (instance == null) { instance = new LimaSwingConfig(); instance.loadConfiguration(configFile); } - return instance; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm