Updated Branches: refs/heads/master 2de258779 -> d81ae5759
Protect against NPE Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d81ae575 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d81ae575 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d81ae575 Branch: refs/heads/master Commit: d81ae57596648ef7786177d98df4a772f7cc9f35 Parents: 2de2587 Author: Christian Schneider <[email protected]> Authored: Fri Jan 31 13:12:27 2014 +0100 Committer: Christian Schneider <[email protected]> Committed: Fri Jan 31 13:12:27 2014 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/karaf/itests/KarafTestSupport.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d81ae575/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java index 2b400c0..ccde975 100644 --- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java @@ -26,6 +26,7 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; import java.io.PrintStream; +import java.net.URL; import java.security.Principal; import java.security.PrivilegedExceptionAction; import java.util.Arrays; @@ -108,7 +109,11 @@ public class KarafTestSupport { } public File getConfigFile(String path) { - return new File(this.getClass().getResource(path).getFile()); + URL res = this.getClass().getResource(path); + if (res == null) { + throw new RuntimeException("Config resource " + path + " not found"); + } + return new File(res.getFile()); } @Configuration
