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

Merge branch 'master' of oss.readytalk.com:/var/local/git/avian

Browse Source
This commit is contained in:
Joel Dice 2009-09-18 18:01:57 -06:00
commit 1a2eb3836c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classpath/java/util/Properties.java
View File

@ -45,8 +45,8 @@ public class Properties extends Hashtable {
return value;
}
public void setProperty(String key, String value) {
put(key, value);
public Object setProperty(String key, String value) {
return put(key, value);
}
private static class Parser {

2
src/builtin.cpp
View File

@ -1150,7 +1150,7 @@ Avian_java_lang_Runtime_exit
{
shutDown(t);
t->m->system->exit(*arguments);
t->m->system->exit(arguments[1]);
}
extern "C" JNIEXPORT int64_t JNICALL

5
src/machine.cpp
View File

@ -1818,6 +1818,7 @@ makeArrayClass(Thread* t, object loader, unsigned dimensions, object spec,
object
makeArrayClass(Thread* t, object loader, object spec)
{
PROTECT(t, loader);
PROTECT(t, spec);
const char* s = reinterpret_cast<const char*>(&byteArrayBody(t, spec, 0));
@ -3752,8 +3753,6 @@ runJavaThread(Thread* t)
void
runFinalizeThread(Thread* t)
{
fprintf(stderr, "run finalize thread\n");
setDaemon(t, t->javaThread, true);
object list = 0;
@ -3768,8 +3767,6 @@ runFinalizeThread(Thread* t)
}
if (t->m->finalizeThread == 0) {
fprintf(stderr, "exit finalize thread\n");
return;
} else {
list = t->m->objectsToFinalize;