svn commit: r1345475 - /commons/proper/imaging/trunk/NOTICE.txt

2012-06-02 Thread damjan 
Author: damjan
Date: Sat Jun  2 10:02:39 2012
New Revision: 1345475

URL: http://svn.apache.org/viewvc?rev=1345475view=rev
Log:
Update copyright notice and years in NOTICE.txt.


Modified:
commons/proper/imaging/trunk/NOTICE.txt

Modified: commons/proper/imaging/trunk/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/NOTICE.txt?rev=1345475r1=1345474r2=1345475view=diff
==
--- commons/proper/imaging/trunk/NOTICE.txt (original)
+++ commons/proper/imaging/trunk/NOTICE.txt Sat Jun  2 10:02:39 2012
@@ -1,5 +1,5 @@
-Apache Imaging
-Copyright 2007-2011 The Apache Software Foundation.
+Apache Commons Imaging
+Copyright 2007-2012 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

svn commit: r1345558 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java

2012-06-02 Thread rgoers 
Author: rgoers
Date: Sat Jun  2 19:08:54 2012
New Revision: 1345558

URL: http://svn.apache.org/viewvc?rev=1345558view=rev
Log:
Use Java 5 to reduce thread contention

Modified:

commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java

Modified: 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1345558r1=1345557r2=1345558view=diff
==
--- 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
 (original)
+++ 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
 Sat Jun  2 19:08:54 2012
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import org.apache.commons.configuration.event.ConfigurationErrorListener;
 import org.apache.commons.configuration.event.ConfigurationListener;
@@ -62,8 +64,8 @@ public class DynamicCombinedConfiguratio
 };
 
 /** The CombinedConfigurations */
-private MapString, CombinedConfiguration configs =
-new HashMapString, CombinedConfiguration();
+private final ConcurrentMapString, CombinedConfiguration configs =
+new ConcurrentHashMapString, CombinedConfiguration();
 
 /** Stores a list with the contained configurations. */
 private ListConfigData configurations = new ArrayListConfigData();
@@ -823,41 +825,44 @@ public class DynamicCombinedConfiguratio
 private CombinedConfiguration getCurrentConfig()
 {
 String key = localSubst.replace(keyPattern);
-CombinedConfiguration config;
-synchronized (getNodeCombiner())
+CombinedConfiguration config = configs.get(key);
+// The double-checked works here due to the Thread guarantees of 
ConcurrentMap.
+if (config == null)
 {
-config = configs.get(key);
-if (config == null)
+synchronized(configs)
 {
-config = new CombinedConfiguration(getNodeCombiner());
-if (loggerName != null)
+config = configs.get(key);
+if (config == null)
 {
-Log log = LogFactory.getLog(loggerName);
-if (log != null)
+config = new CombinedConfiguration(getNodeCombiner());
+if (loggerName != null)
 {
-config.setLogger(log);
+Log log = LogFactory.getLog(loggerName);
+if (log != null)
+{
+config.setLogger(log);
+}
 }
+
config.setIgnoreReloadExceptions(isIgnoreReloadExceptions());
+config.setExpressionEngine(this.getExpressionEngine());
+
config.setDelimiterParsingDisabled(isDelimiterParsingDisabled());
+
config.setConversionExpressionEngine(getConversionExpressionEngine());
+config.setListDelimiter(getListDelimiter());
+for (ConfigurationErrorListener listener : 
getErrorListeners())
+{
+config.addErrorListener(listener);
+}
+for (ConfigurationListener listener : 
getConfigurationListeners())
+{
+config.addConfigurationListener(listener);
+}
+config.setForceReloadCheck(isForceReloadCheck());
+for (ConfigData data : configurations)
+{
+config.addConfiguration(data.getConfiguration(), 
data.getName(), data.getAt());
+}
+configs.put(key, config);
 }
-config.setIgnoreReloadExceptions(isIgnoreReloadExceptions());
-config.setExpressionEngine(this.getExpressionEngine());
-
config.setDelimiterParsingDisabled(isDelimiterParsingDisabled());
-
config.setConversionExpressionEngine(getConversionExpressionEngine());
-config.setListDelimiter(getListDelimiter());
-for (ConfigurationErrorListener listener : getErrorListeners())
-{
-config.addErrorListener(listener);
-}
-for (ConfigurationListener listener : 
getConfigurationListeners())
-{
-

svn commit: r1345621 - /commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java

2012-06-02 Thread ggregory 
Author: ggregory
Date: Sun Jun  3 02:43:11 2012
New Revision: 1345621

URL: http://svn.apache.org/viewvc?rev=1345621view=rev
Log:
Inline needless lvar.

Modified:

commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java

Modified: 
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java?rev=1345621r1=1345620r2=1345621view=diff
==
--- 
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java
 (original)
+++ 
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java
 Sun Jun  3 02:43:11 2012
@@ -30,8 +30,7 @@ public class XmlStreamReaderUtilitiesCom
 protected String calculateRawEncoding(String bomEnc, String xmlGuessEnc, 
String xmlEnc,
 String defaultEncoding) throws IOException {
 MockXmlStreamReader mock = new MockXmlStreamReader(defaultEncoding);
-String encoding = mock.calculateRawEncoding(bomEnc, xmlGuessEnc, 
xmlEnc, null);
-return encoding;
+return mock.calculateRawEncoding(bomEnc, xmlGuessEnc, xmlEnc, null);
 }
 @Override
 protected String calculateHttpEncoding(String httpContentType, String 
bomEnc, String xmlGuessEnc,