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 2018/07/26 19:39:33 UTC
svn commit: r1836754 -
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
Author: oheger
Date: Thu Jul 26 19:39:33 2018
New Revision: 1836754
URL: http://svn.apache.org/viewvc?rev=1836754&view=rev
Log:
Fixed an expression that is not Java7 compatible.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
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=1836754&r1=1836753&r2=1836754&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 Thu Jul 26 19:39:33 2018
@@ -1460,8 +1460,16 @@ public class CombinedConfigurationBuilde
throws ConfigurationException
{
boolean createBuilders = builders.isEmpty();
- List<ConfigurationBuilder<? extends Configuration>> newBuilders =
- createBuilders ? new ArrayList<>(srcDecl.size()) : builders;
+ List<ConfigurationBuilder<? extends Configuration>> newBuilders;
+ if (createBuilders)
+ {
+ newBuilders = new ArrayList<>(srcDecl.size());
+ }
+ else
+ {
+ newBuilders = builders;
+ }
+
for (int i = 0; i < srcDecl.size(); i++)
{
ConfigurationBuilder<? extends Configuration> b;