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

various fixes for running Tomcat on the OpenJDK build

Browse Source
This commit is contained in:
Joel Dice 2011-02-25 08:17:15 -07:00
parent f1255c8fd8
commit 42fd021acf
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/classpath-openjdk.cpp
View File

@ -1845,7 +1845,7 @@ EXPORT(JVM_IHashCode)(Thread* t, jobject o)
{
ENTER(t, Thread::ActiveState);
return objectHash(t, *o);
return o ? objectHash(t, *o) : 0;
}
uint64_t
@ -2913,10 +2913,18 @@ extern "C" JNIEXPORT jobjectArray JNICALL
EXPORT(JVM_GetDeclaredClasses)(Thread*, jclass) { abort(); }
extern "C" JNIEXPORT jclass JNICALL
EXPORT(JVM_GetDeclaringClass)(Thread*, jclass) { abort(); }
EXPORT(JVM_GetDeclaringClass)(Thread*, jclass)
{
// todo: implement properly
return 0;
}
extern "C" JNIEXPORT jstring JNICALL
EXPORT(JVM_GetClassSignature)(Thread*, jclass) { abort(); }
EXPORT(JVM_GetClassSignature)(Thread*, jclass)
{
// todo: implement properly
return 0;
}
extern "C" JNIEXPORT jbyteArray JNICALL
EXPORT(JVM_GetClassAnnotations)(Thread* t, jclass c)
@ -3769,7 +3777,14 @@ EXPORT(JVM_GetSockName)(jint socket, struct sockaddr* address,
}
extern "C" JNIEXPORT jint JNICALL
EXPORT(JVM_GetSockOpt)(jint, int, int, char*, int*) { abort(); }
EXPORT(JVM_GetSockOpt)(jint socket, int level, int optionName,
char* optionValue, int* optionLength)
{
socklen_t length;
int rv = getsockopt(socket, level, optionName, optionValue, &length);
*optionLength = length;
return rv;
}
extern "C" JNIEXPORT jint JNICALL
EXPORT(JVM_SetSockOpt)(jint socket, int level, int optionName,
@ -3836,7 +3851,11 @@ extern "C" JNIEXPORT jobject JNICALL
EXPORT(JVM_InitAgentProperties)(Thread*, jobject) { abort(); }
extern "C" JNIEXPORT jobjectArray JNICALL
EXPORT(JVM_GetEnclosingMethodInfo)(JNIEnv*, jclass) { abort(); }
EXPORT(JVM_GetEnclosingMethodInfo)(JNIEnv*, jclass)
{
// todo: implement properly
return 0;
}
extern "C" JNIEXPORT jintArray JNICALL
EXPORT(JVM_GetThreadStateValues)(JNIEnv*, jint) { abort(); }