Changeset 12700 for branches/0.20.x
- Timestamp:
- 05/18/10 05:17:07 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.20.x/abcl/src/org/armedbear/lisp/Pathname.java
r12697 r12700 356 356 } 357 357 Debug.assertTrue(scheme != null); 358 String authority = url.getAuthority(); 358 URI uri = null; 359 try { 360 uri = url.toURI().normalize(); 361 } catch (URISyntaxException e) { 362 error(new LispError("Could not form URI from " 363 + "'" + url + "'" 364 + " because: " + e)); 365 } 366 String authority = uri.getAuthority(); 359 367 Debug.assertTrue(authority != null); 360 368 … … 368 376 369 377 // URI encode necessary characters 370 URI uri = null;371 try {372 uri = url.toURI().normalize();373 } catch (URISyntaxException e) {374 error(new LispError("Could not URI escape characters in "375 + "'" + url + "'"376 + " because: " + e));377 }378 379 378 String path = uri.getRawPath(); 380 379 if (path == null) { … … 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.