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/01/11 20:29:10 UTC
incubator-tamaya git commit: TAMAYA-43: Fixed bug in Locator,
which removed first slash in nix paths.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 6c00b06d8 -> d11ebcf5e
TAMAYA-43: Fixed bug in Locator, which removed first slash in nix paths.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/d11ebcf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/d11ebcf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/d11ebcf5
Branch: refs/heads/master
Commit: d11ebcf5e58f246a0cb5c8ba81ebb9263fec6e0f
Parents: 6c00b06
Author: anatole <an...@apache.org>
Authored: Sun Jan 11 20:29:04 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Sun Jan 11 20:29:04 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/tamaya/resource/internal/Locator.java | 2 +-
.../org/apache/tamaya/resource/internal/FileCollectorTest.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d11ebcf5/modules/resources/src/main/java/org/apache/tamaya/resource/internal/Locator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/Locator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/Locator.java
index acab285..3e861d3 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/Locator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/Locator.java
@@ -49,7 +49,7 @@ final class Locator {
* @return the tokenized instance.
*/
public static Locator of(String expression) {
- return new Locator(Arrays.asList(expression.split("/")).stream().filter((s) -> !s.isEmpty()).collect(Collectors.toList()));
+ return new Locator(Arrays.asList(expression.split("/")).stream().collect(Collectors.toList()));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d11ebcf5/modules/resources/src/test/java/org/apache/tamaya/resource/internal/FileCollectorTest.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/test/java/org/apache/tamaya/resource/internal/FileCollectorTest.java b/modules/resources/src/test/java/org/apache/tamaya/resource/internal/FileCollectorTest.java
index 41c60c9..9fe59d8 100644
--- a/modules/resources/src/test/java/org/apache/tamaya/resource/internal/FileCollectorTest.java
+++ b/modules/resources/src/test/java/org/apache/tamaya/resource/internal/FileCollectorTest.java
@@ -55,6 +55,7 @@ public class FileCollectorTest {
assertEquals(found, found2);
}
+
@Test
public void testCollectResourcesFromLocalFSPath_WithFolderAny() throws Exception {
String resDir = getResourceDir();