Changeset 12696
- Timestamp:
- 05/17/10 17:27:55 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/Pathname.java
r12695 r12696 356 356 } 357 357 Debug.assertTrue(scheme != null); 358 // String authority = url.getAuthority();359 358 URI uri = null; 360 359 try { 361 360 uri = url.toURI().normalize(); 362 361 } catch (URISyntaxException e) { 363 error(new LispError("Could not URI escape characters in"362 error(new LispError("Could form URI from " 364 363 + "'" + url + "'" 365 364 + " because: " + e)); … … 1978 1977 } else if (pathname.isURL()) { 1979 1978 if (pathname.getInputStream() != null) { 1980 return pathname; 1979 // If there is no type, query or fragment, we check to 1980 // see if there is URL available "underneath". 1981 if (pathname.name != NIL 1982 && pathname.type == NIL 1983 && Symbol.GETF.execute(pathname.host, QUERY, NIL) == NIL 1984 && Symbol.GETF.execute(pathname.host, FRAGMENT, NIL) == NIL) { 1985 Pathname p = new Pathname(pathname.getNamestring() + "/"); 1986 if (p.getInputStream() != null) { 1987 return p; 1988 } 1989 } 1990 return pathname; 1981 1991 } 1982 1992 } else
Note: See TracChangeset
for help on using the changeset viewer.