You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2015/04/11 22:35:49 UTC
svn commit: r1672931 - in /commons/proper/configuration/trunk:
conf/findbugs-exclude-filter.xml
src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
Author: oheger
Date: Sat Apr 11 20:35:49 2015
New Revision: 1672931
URL: http://svn.apache.org/r1672931
Log:
Findbugs error "IS2_INCONSISTENT_SYNC" in CombinedConfigurationBuilder.
Added synchronized keyword to getChildBuilders() method. The remaining
unsynchronized access to the sourceData field is caused by the
initResultInstance() method.
Modified:
commons/proper/configuration/trunk/conf/findbugs-exclude-filter.xml
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
Modified: commons/proper/configuration/trunk/conf/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/conf/findbugs-exclude-filter.xml?rev=1672931&r1=1672930&r2=1672931&view=diff
==============================================================================
--- commons/proper/configuration/trunk/conf/findbugs-exclude-filter.xml (original)
+++ commons/proper/configuration/trunk/conf/findbugs-exclude-filter.xml Sat Apr 11 20:35:49 2015
@@ -62,4 +62,9 @@
<Field name="reloadingController" />
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
+ <Match>
+ <Class name="org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder" />
+ <Field name="sourceData" />
+ <Bug pattern="IS2_INCONSISTENT_SYNC" />
+ </Match>
</FindBugsFilter>
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java?rev=1672931&r1=1672930&r2=1672931&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java Sat Apr 11 20:35:49 2015
@@ -757,7 +757,7 @@ public class CombinedConfigurationBuilde
*
* @return a collection with the builders for child configuration sources
*/
- protected Collection<ConfigurationBuilder<? extends Configuration>> getChildBuilders()
+ protected synchronized Collection<ConfigurationBuilder<? extends Configuration>> getChildBuilders()
{
return sourceData.getChildBuilders();
}