Anonymous avatar Anonymous committed e52bbc5

XW-695 NPE if running in JVM without java.home (Google App Engine)
applied patch submitted by Leonard Broman, thanks!

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1988 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java

 
     public UrlSet excludeJavaHome() throws MalformedURLException {
         String path = System.getProperty("java.home");
+        if (path != null) {
 
-        File java = new File(path);
+            File java = new File(path);
 
-        if (path.matches("/System/Library/Frameworks/JavaVM.framework/Versions/[^/]+/Home")){
-            java = java.getParentFile();
+            if (path.matches("/System/Library/Frameworks/JavaVM.framework/Versions/[^/]+/Home")){
+                java = java.getParentFile();
+            }
+            return exclude(java);
+        } else {
+            return this;
         }
-
-        return exclude(java);
     }
 
     public UrlSet excludePaths(String pathString) throws MalformedURLException {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.