ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 11:16:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into dicej

Browse Source
This commit is contained in:
Joel Dice 2013-02-25 16:43:09 -07:00
commit 025b628894
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -324,7 +324,7 @@ _Stand-alone build:_
openjdk-src=$(pwd)/../p/jdk7u-dev/jdk/src test openjdk-src=$(pwd)/../p/jdk7u-dev/jdk/src test
####Windows (Cygwin): ####Windows (Cygwin):
_Prerequisite:_ Build OpenJDK 7 according to [this site](http://weblogs.java.net/blog/simonis/archive/2011/10/28/yaojowbi-yet-another-openjdk-windows-build-instruction). _Prerequisite:_ Build OpenJDK 7 according to [this site](http://weblogs.java.net/blog/simonis/archive/2011/10/28/yaojowbi-yet-another-openjdk-windows-build-instruction). Alternatively, use https://github.com/alexkasko/openjdk-unofficial-builds.
_Conventional build:_ _Conventional build:_

8
src/classpath-openjdk.cpp
View File

@ -1877,7 +1877,7 @@ loadLibrary(Thread* t, object, uintptr_t* arguments)
#ifdef AVIAN_OPENJDK_SRC #ifdef AVIAN_OPENJDK_SRC
if (not absolute) { if (not absolute) {
if (strcmp(n, "net") == 0) { if (strcmp(RUNTIME_ARRAY_BODY(n), "net") == 0) {
bool ran; bool ran;
{ ACQUIRE(t, t->m->classLock); { ACQUIRE(t, t->m->classLock);
@ -1894,7 +1894,7 @@ loadLibrary(Thread* t, object, uintptr_t* arguments)
} }
return; return;
} else if (strcmp(n, "management") == 0) { } else if (strcmp(RUNTIME_ARRAY_BODY(n), "management") == 0) {
bool ran; bool ran;
{ ACQUIRE(t, t->m->classLock); { ACQUIRE(t, t->m->classLock);
@ -1911,8 +1911,8 @@ loadLibrary(Thread* t, object, uintptr_t* arguments)
} }
return; return;
} else if (strcmp(n, "zip") == 0 } else if (strcmp(RUNTIME_ARRAY_BODY(n), "zip") == 0
or strcmp(n, "nio") == 0) or strcmp(RUNTIME_ARRAY_BODY(n), "nio") == 0)
{ {
return; return;
} }