# HG changeset patch # User Jaroslav Tulach # Date 1381502034 -7200 # Node ID bce873fcaf1a833cd0d9113a924dbeb3378251b5 # Parent 6193e735f4d1824d7f6883d7258cb01b2e0e0152 Compute the location also in WebWorker environment diff -r 6193e735f4d1 -r bce873fcaf1a rt/emul/mini/src/main/java/java/net/URL.java --- a/rt/emul/mini/src/main/java/java/net/URL.java Fri Oct 11 09:58:03 2013 +0200 +++ b/rt/emul/mini/src/main/java/java/net/URL.java Fri Oct 11 16:33:54 2013 +0200 @@ -1070,10 +1070,16 @@ } @JavaScriptBody(args = {}, body = - "if (typeof window !== 'object') return null;\n" - + "if (!window.location) return null;\n" - + "if (!window.location.href) return null;\n" - + "return window.location.href;\n" + "var l;\n" + + "if (typeof location !== 'object') {" + + " if (typeof window !== 'object') return null;\n" + + " if (!window.location) return null;\n" + + " l = window.location;\n" + + "} else {\n" + + " l = location;\n" + + "}\n" + + "if (!l.href) return null;\n" + + "return l.href;\n" ) private static native String findBaseURL(); }