You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2015/10/29 17:00:00 UTC
incubator-tamaya git commit: Fixed quality issues.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master b79bceef5 -> d02026f71
Fixed quality issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/d02026f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/d02026f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/d02026f7
Branch: refs/heads/master
Commit: d02026f7173714f074f9d3c2ea8cb3bb27e5ef97
Parents: b79bcee
Author: anatole <an...@apache.org>
Authored: Thu Oct 29 16:59:52 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Thu Oct 29 16:59:52 2015 +0100
----------------------------------------------------------------------
.../apache/tamaya/format/BaseFormatPropertySourceProvider.java | 5 -----
.../java/org/apache/tamaya/resource/internal/FileCollector.java | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d02026f7/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
index 6b5fd27..f5a3457 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
@@ -30,7 +30,6 @@ import java.util.Collection;
import java.util.Enumeration;
import java.util.List;
import java.util.Objects;
-import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -54,10 +53,6 @@ public abstract class BaseFormatPropertySourceProvider implements PropertySource
* The paths to be evaluated.
*/
private Collection<URL> paths = new ArrayList<>();
- /**
- * The ClassLoader to use.
- */
- private Optional<ClassLoader> classLoader;
/**
* Creates a new instance.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d02026f7/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileCollector.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileCollector.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileCollector.java
index 3bd0308..f019c75 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileCollector.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileCollector.java
@@ -80,7 +80,7 @@ public class FileCollector {
* @return the URLs matching the tokens
*/
static Collection<URL> traverseAndSelectFromChildren(File dir, List<String> subTokens, int tokenIndex) {
- if (tokenIndex >= subTokens.size() || dir.isFile()) {
+ if (tokenIndex >= subTokens.size() || dir.isFile() || !dir.isDirectory()) {
return Collections.emptyList();
}
List<URL> result = new ArrayList<>();