Merge pull request #1224 from flybyray/play1-1223

[#1823] Fix play.exceptions.CompilationException (fix for the fix #786)
playframework · Mar 16, 2018 · a7b2fcf · a7b2fcf
2 parents 71874ce + ccb76af
commit a7b2fcf
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/framework/src/play/classloading/ApplicationClassloader.java b/framework/src/play/classloading/ApplicationClassloader.java
@@ -238,34 +238,39 @@ public InputStream getResourceAsStream(String name) {
                 return res.inputstream();
             }
         }
-        URL url = this.getResource(name);
-        if (url != null) {
-            try {
-                File file = new File(url.toURI());
-                String fileName = file.getCanonicalFile().getName();
-                if (!name.endsWith(fileName)) {
-                    return null;
-                }
-            } catch (Exception e) {
-            }
-        }
+        URL url = getResource(name);
 
         return super.getResourceAsStream(name);
     }
 
     @Override
     public URL getResource(String name) {
-            for (VirtualFile vf : Play.javaPath) {
-                VirtualFile res = vf.child(name);
-                if (res != null && res.exists()) {
+        URL url = null;
+        for (VirtualFile vf : Play.javaPath) {
+            VirtualFile res = vf.child(name);
+            if (res != null && res.exists()) {
                 try {
-                    return res.getRealFile().toURI().toURL();
-        } catch (MalformedURLException ex) {
-            throw new UnexpectedException(ex);
+                    url = res.getRealFile().toURI().toURL();
+                    break;
+                } catch (MalformedURLException ex) {
+                    throw new UnexpectedException(ex);
+                }
+            }
         }
+        if (url == null) {
+            url = super.getResource(name);
+            if (url != null) {
+                try {
+                    File file = new File(url.toURI());
+                    String fileName = file.getCanonicalFile().getName();
+                    if (!name.endsWith(fileName)) {
+                        url = null;
+                    }
+                } catch (Exception ignore) {
+                }
             }
         }
-        return super.getResource(name);
+        return url;
     }
 
     @Override