You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/04/06 16:56:10 UTC
svn commit: r1585311 -
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
Author: mattsicker
Date: Sun Apr 6 14:56:10 2014
New Revision: 1585311
URL: http://svn.apache.org/r1585311
Log:
Add comment regarding proper double-checked locking.
- Quiets the static code analyzers.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java?rev=1585311&r1=1585310&r2=1585311&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java Sun Apr 6 14:56:10 2014
@@ -112,6 +112,8 @@ public abstract class ConfigurationFacto
* @return the ConfigurationFactory.
*/
public static ConfigurationFactory getInstance() {
+ // volatile works in Java 1.6+, so double-checked locking also works properly
+ //noinspection DoubleCheckedLocking
if (factories == null) {
synchronized(TEST_PREFIX) {
if (factories == null) {