Merge pull request #9717 from yvesf/fix-9716

graemerocher · graemerocher · commit 710281ffc19c · 2016-02-18T11:47:24.000+01:00
Extend test in isWarDeployed to work with weblogic
diff --git a/grails-bootstrap/src/main/groovy/grails/util/Environment.java b/grails-bootstrap/src/main/groovy/grails/util/Environment.java
@@ -292,8 +292,11 @@ public static boolean isWarDeployed() {
         if(loadedLocation != null && loadedLocation.getPath().contains("/WEB-INF/classes")) {
             return true;
         }
+        // Workaround for weblogic who repacks files from 'classes' into a new jar under lib/
+        if (loadedLocation != null && loadedLocation.getPath().contains("_wl_cls_gen.jar!/")) {
+            return true;
+        }
         return false;
-
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,11 @@ public static boolean isWarDeployed() {`
`292`	`292`	`if(loadedLocation != null && loadedLocation.getPath().contains("/WEB-INF/classes")) {`
`293`	`293`	`return true;`
`294`	`294`	`}`
	`295`	`+ // Workaround for weblogic who repacks files from 'classes' into a new jar under lib/`
	`296`	`+ if (loadedLocation != null && loadedLocation.getPath().contains("_wl_cls_gen.jar!/")) {`
	`297`	`+ return true;`
	`298`	`+ }`
`295`	`299`	`return false;`
`296`		`-`
`297`	`300`	`}`
`298`	`301`
`299`	`302`	`/**`