ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-08 14:03:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classpath/java-io.cpp
View File

@ -184,7 +184,8 @@ inline Mapping*
map(JNIEnv* e, string_t path) map(JNIEnv* e, string_t path)
{ {
Mapping* result = 0; 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); OPEN_EXISTING, 0, 0);
if (file != INVALID_HANDLE_VALUE) { if (file != INVALID_HANDLE_VALUE) {
unsigned size = GetFileSize(file, 0); unsigned size = GetFileSize(file, 0);

2
classpath/java/net/URLStreamHandler.java
View File

@ -38,7 +38,7 @@ public abstract class URLStreamHandler {
host = s.substring(0, slash); host = s.substring(0, slash);
} else { } else {
host = s.substring(0, colon); 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); s = s.substring(slash + 1);
} }