From fcb521e832b63dc9979e90137ed29203b4f78cee Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <niko@krismer.de>
Date: Mon, 19 May 2014 20:13:52 +0200
Subject: [PATCH] tried fixing test problems on jenkins server
---
.../it/unibz/inf/isochrone/config/ConfigDataset.java | 12 +-----------
.../it/unibz/inf/isochrone/util/ResourceHelper.java | 2 +-
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java b/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java
index 22b2945d..e99648a8 100644
--- a/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java
+++ b/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java
@@ -37,9 +37,7 @@ import java.util.regex.Pattern;
import javax.validation.constraints.NotNull;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -388,15 +386,7 @@ public class ConfigDataset {
}
// find resources on classpath (in jar files...) and add to available ones
- r2 = cLoader.getResourceAsStream("");
- if (r2 != null) {
- final Collection<String> files = IOUtils.readLines(r2, Charsets.UTF_8);
- for (String filename : files) {
- if (dsConfigPattern.matcher(filename).matches()) {
- resources.add(filename);
- }
- }
- }
+ resources.addAll(ResourceHelper.findFilesInClassPath(dsConfigPattern));
// find resources on webapp resources (in tomcat lib folder, in WEB-INF...) and add to available ones
final Enumeration<URL> e = cLoader.getResources("../lib");
diff --git a/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java b/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java
index 2a6c23f2..a6b98a92 100644
--- a/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java
+++ b/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java
@@ -36,7 +36,7 @@ public final class ResourceHelper {
}
public static Set<String> findFilesInResources(final String[] pathElements, final Pattern fileNamePattern) throws IOException {
- Set<String> result = new HashSet<String>();
+ final Set<String> result = new HashSet<String>();
for (String element : pathElements) {
final File newFile = new File(element);
if (newFile.isDirectory()) {
--
GitLab