Merge remote branch 'origin/http_url' into prv-ga-merge

This commit is contained in:
Dain 2012-02-16 11:08:53 -07:00
commit 84185f0884
2 changed files with 3 additions and 2 deletions

View File

@ -184,7 +184,8 @@ inline Mapping*
map(JNIEnv* e, string_t path)
{
Mapping* result = 0;
HANDLE file = CreateFileW(path, FILE_READ_DATA, FILE_SHARE_READ, 0,
HANDLE file = CreateFileW(path, FILE_READ_DATA,
FILE_SHARE_READ | FILE_SHARE_WRITE, 0,
OPEN_EXISTING, 0, 0);
if (file != INVALID_HANDLE_VALUE) {
unsigned size = GetFileSize(file, 0);

View File

@ -38,7 +38,7 @@ public abstract class URLStreamHandler {
host = s.substring(0, slash);
} else {
host = s.substring(0, colon);
port = Integer.parseInt(s.substring(colon + 1), slash);
port = Integer.parseInt(s.substring(colon + 1, slash));
}
s = s.substring(slash + 1);
}