summaryrefslogtreecommitdiff
path: root/jvmaccess/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-06-15 09:25:58 +0000
committerOliver Bolte <obo@openoffice.org>2005-06-15 09:25:58 +0000
commit81b2b22d15bb906e6c75765442509cfa374e1e7a (patch)
treeb4b6b9583f09d3643057e96cca1dd5426b7c6a47 /jvmaccess/source
parent03b14810a2eac5c179d79b83020d711e3b0653a0 (diff)
INTEGRATION: CWS buildfixes01 (1.4.6); FILE MERGED
2005/06/07 13:42:55 thb 1.4.6.1: #i50426# Corrected license header
Diffstat (limited to 'jvmaccess/source')
-rw-r--r--jvmaccess/source/virtualmachine.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/jvmaccess/source/virtualmachine.cxx b/jvmaccess/source/virtualmachine.cxx
index cc112fe040fd..18190d2c279e 100644
--- a/jvmaccess/source/virtualmachine.cxx
+++ b/jvmaccess/source/virtualmachine.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: virtualmachine.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2004-11-09 11:50:10 $
+ * last change: $Author: obo $ $Date: 2005-06-15 10:25:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,8 +102,11 @@ VirtualMachine::VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy,
JNIEnv * pMainThreadEnv):
m_pVm(pVm), m_nVersion(nVersion), m_bDestroy(bDestroy)
{
+#ifdef SOLAR_JAVA
OSL_ENSURE(pVm != 0 && nVersion >= JNI_VERSION_1_2 && pMainThreadEnv != 0,
"bad parameter");
+#endif
+
acquireInitialContextClassLoader(pMainThreadEnv);
}