This is an automated email from the ASF dual-hosted git repository. mattjuntunen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push: new 69260fa1 Simplify conditions and avoid extra checks. 69260fa1 is described below commit 69260fa1e9c4f87b1abf1c301825a53a722b6007 Author: Arturo Bernal <arturobern...@gmail.com> AuthorDate: Thu Aug 26 07:12:47 2021 +0200 Simplify conditions and avoid extra checks. --- .../commons/configuration2/DynamicCombinedConfiguration.java | 8 ++------ .../java/org/apache/commons/configuration2/INIConfiguration.java | 3 ++- .../java/org/apache/commons/configuration2/io/VFSFileSystem.java | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java index d255ea05..b33952dc 100644 --- a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java @@ -308,9 +308,7 @@ public class DynamicCombinedConfiguration extends CombinedConfiguration { @Override protected void clearInternal() { - if (configs != null) { - this.getCurrentConfig().clear(); - } + this.getCurrentConfig().clear(); } @Override @@ -505,9 +503,7 @@ public class DynamicCombinedConfiguration extends CombinedConfiguration { @Override protected void setPropertyInternal(final String key, final Object value) { - if (configs != null) { - this.getCurrentConfig().setProperty(key, value); - } + this.getCurrentConfig().setProperty(key, value); } @Override diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java index 55af0e1a..b32fa6ca 100644 --- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java @@ -709,10 +709,11 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F final String commentChars = getCommentLeadingCharsUsedInInput(); boolean quoted = false; - for (int i = 0; i < commentChars.length() && !quoted; i++) { + for (int i = 0; i < commentChars.length(); i++) { final char c = commentChars.charAt(i); if (value.indexOf(c) != -1) { quoted = true; + break; } } diff --git a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java index 7de2d8c5..3fd2b214 100644 --- a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java @@ -256,7 +256,7 @@ public class VFSFileSystem extends DefaultFileSystem { file = getManager().resolveFile(base, fileName); } else { - final FileSystemOptions opts = fileScheme != null ? getOptions(fileScheme) : null; + final FileSystemOptions opts = getOptions(fileScheme); file = getManager().resolveFile(fileName, opts); }