Proper resource load via classloading delegation.

vjkr · Oct 24, 2014 · 303adbe · 303adbe
1 parent 6b7fa6e
commit 303adbe
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/water/Boot.java b/src/main/java/water/Boot.java
@@ -75,6 +75,8 @@ private byte[] getMD5(InputStream is) throws IOException {
   }
 
   private Boot() throws IOException {
+
+    super(Thread.currentThread().getContextClassLoader());
     final String ownJar = getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
     Log.POST(2000, "ownJar is " + ownJar);
     ZipFile jar = null;
@@ -372,7 +374,10 @@ private void extractInternalFiles() throws IOException {
 
   public InputStream getResource2(String uri) {
     if( fromJar() ) {
-      return _systemLoader.getResourceAsStream("resources"+uri);
+      InputStream is = _systemLoader.getResourceAsStream("resources"+uri);
+      if (is==null) is = this.getClass().getClassLoader().getResourceAsStream("resources"+uri);
+      if (is==null) is = Thread.currentThread().getContextClassLoader().getResourceAsStream("resources"+uri);
+      return is;
     } else {
       try {
         File resources  = new File("lib/resources");