Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1015)

Unified Diff: compiler/java/com/google/dart/compiler/SystemLibraryManager.java

Issue 10540162: fix for correct resolution of package: uris (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/SystemLibraryManager.java
===================================================================
--- compiler/java/com/google/dart/compiler/SystemLibraryManager.java (revision 8664)
+++ compiler/java/com/google/dart/compiler/SystemLibraryManager.java (working copy)
@@ -283,7 +283,15 @@
return library.translateUri(uri);
}
if (isPackageUri(uri)){
- URI fileUri = packageRootUri.resolve(uri.getHost() + uri.getPath());
+ URI fileUri;
+ // TODO(keertip): Investigate further
+ // if uri.getHost() returns null, then it is resolved right
+ // so use uri.getAuthority to resolve
+ if (uri.getHost() != null){
danrubel 2012/06/14 21:15:23 Please update the comment to include a URI in whic
+ fileUri = packageRootUri.resolve(uri.getHost() + uri.getPath());
+ } else {
+ fileUri = packageRootUri.resolve(uri.getAuthority() + uri.getPath());
+ }
File file = new File(fileUri);
return file.toURI();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698