accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/9] accumulo git commit: ACCUMULO-4026 Added conf.isFile() check to ClientConfiguration loading.
Date Sun, 18 Oct 2015 22:00:08 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 eacc27ac4 -> 1ab3827be
  refs/heads/1.7 d7e7c643c -> 0c3dc17e9
  refs/heads/master b34df1aba -> 72f3d89d9


ACCUMULO-4026 Added conf.isFile() check to ClientConfiguration loading.

Signed-off-by: Josh Elser <elserj@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.6
Commit: 5c2a93e94070883426549f562a3a6ca82914a897
Parents: eacc27a
Author: klucar <klucar@gmail.com>
Authored: Tue Oct 13 16:48:54 2015 -0400
Committer: Josh Elser <elserj@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));
         }
       }


Mime
View raw message