diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 11:41:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 11:41:32 +0000 |
| commit | 44bf5dacd75eec3d27acf9590a29ce49a3b585cf (patch) | |
| tree | d4bf189a381cfc27c683a3f105927c66a63fa0e9 /jvmaccess/source | |
| parent | b7ea5b0ca567c0ce8272148244e4579dcec548a7 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'jvmaccess/source')
| -rw-r--r-- | jvmaccess/source/makefile.mk | 10 | ||||
| -rw-r--r-- | jvmaccess/source/virtualmachine.cxx | 12 |
2 files changed, 16 insertions, 6 deletions
diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk index f6a34ba39858..ac46bcb3a31a 100644 --- a/jvmaccess/source/makefile.mk +++ b/jvmaccess/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: sb $ $Date: 2002-12-06 11:35:36 $ +# last change: $Author: hr $ $Date: 2003-03-26 12:41:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,6 +68,10 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk SLOFILES = \ - $(SLO)$/virtualmachine.obj + $(SLO)$/javainfo.obj \ + $(SLO)$/javainfoimpl.obj \ + $(SLO)$/sunversion.obj \ + $(SLO)$/virtualmachine.obj \ + $(SLO)$/windows.obj .INCLUDE: target.mk diff --git a/jvmaccess/source/virtualmachine.cxx b/jvmaccess/source/virtualmachine.cxx index 13edcba11f06..91b512fe2739 100644 --- a/jvmaccess/source/virtualmachine.cxx +++ b/jvmaccess/source/virtualmachine.cxx @@ -2,9 +2,9 @@ * * $RCSfile: virtualmachine.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: sb $ $Date: 2002-12-06 11:35:36 $ + * last change: $Author: hr $ $Date: 2003-03-26 12:41:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ VirtualMachine::AttachGuard::~AttachGuard() m_xMachine->detachThread(); } -VirtualMachine::VirtualMachine(JavaVM * pVm, jint nVersion, bool bDestroy, +VirtualMachine::VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy, JNIEnv * pMainThreadEnv): m_pVm(pVm), m_nVersion(nVersion), m_bDestroy(bDestroy) { @@ -112,8 +112,14 @@ VirtualMachine::~VirtualMachine() releaseInitialContextClassLoader(); if (m_bDestroy) { + // Do not destroy the VM. Under Java 1.3, the AWT event loop thread is + // not a daemon thread and is never terminated, so that calling + // DestroyJavaVM (waiting for all non-daemon threads to terminate) hangs + // forever. +/* jint n = m_pVm->DestroyJavaVM(); OSL_ENSURE(n == JNI_OK, "JNI: DestroyJavaVM failed"); +*/ } } |