You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/10/19 00:00:09 UTC
[2/9] accumulo git commit: ACCUMULO-4026 Added conf.isFile() check to
ClientConfiguration loading.
ACCUMULO-4026 Added conf.isFile() check to ClientConfiguration loading.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c2a93e9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c2a93e9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c2a93e9
Branch: refs/heads/1.7
Commit: 5c2a93e94070883426549f562a3a6ca82914a897
Parents: eacc27a
Author: klucar <kl...@gmail.com>
Authored: Tue Oct 13 16:48:54 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Oct 16 00:45:53 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ClientConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c2a93e9/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 2a7a48c..8593d9e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -146,7 +146,7 @@ public class ClientConfiguration extends CompositeConfiguration {
List<Configuration> configs = new LinkedList<Configuration>();
for (String path : paths) {
File conf = new File(path);
- if (conf.canRead()) {
+ if (conf.isFile() && conf.canRead()) {
configs.add(new PropertiesConfiguration(conf));
}
}