Merge pull request #1152 from codeborne/fix-hibernate5-in-precompiled…

…-mode finds classes in precompiled folder too
playframework · May 26, 2017 · 0c59058 · 0c59058
2 parents 1e80b6e + 1156192
commit 0c59058
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/framework/src/play/classloading/ApplicationClassloader.java b/framework/src/play/classloading/ApplicationClassloader.java
@@ -262,7 +262,13 @@ public URL getResource(String name) {
  return res.getRealFile().toURI().toURL();
  }
  }
- if (Play.configuration.getProperty("play.bytecodeCache", "true").equals("true")) {
+ if (Play.usePrecompiled) {
+ File file = Play.getFile("precompiled/java/" + name);
+ if (file.exists()) {
+ return file.toURI().toURL();
+ }
+ }
+ else if ("true".equals(Play.configuration.getProperty("play.bytecodeCache", "true"))) {
  File f = new File(Play.tmpDir, "classes/" + name);
  if (f.exists()) {
  return f.toURI().toURL();