Changeset 12689

Timestamp:

05/16/10 09:09:43 (13 years ago)

Author:

Mark Evenson

Message:

Thunk through URL.toURI() for getting URL authority.

Fixes loading from OSGi context with 'bundleresource:' for which the
java.net.URL object is incorrectly returning 'SECURITY_CHECKED' from
getAuthority().

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -356 +356 @@
             }
             Debug.assertTrue(scheme != null);
-            String authority = url.getAuthority();
-            Debug.assertTrue(authority != null);
-
-            host = NIL;
-            host = host.push(SCHEME);
-            host = host.push(new SimpleString(scheme));
-            host = host.push(AUTHORITY);
-            host = host.push(new SimpleString(authority));
-
-            device = NIL;
-            
-            // URI encode necessary characters
+      //      String authority = url.getAuthority();
             URI uri = null;
             try { 
@@ -376 +365 @@
                                     + " because: " + e));
             }
-
+            String authority = uri.getAuthority();
+            Debug.assertTrue(authority != null);
+
+            host = NIL;
+            host = host.push(SCHEME);
+            host = host.push(new SimpleString(scheme));
+            host = host.push(AUTHORITY);
+            host = host.push(new SimpleString(authority));
+
+            device = NIL;
+            
+            // URI encode necessary characters
             String path = uri.getRawPath();
             if (path == null) {