diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-10-09 09:23:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-10-09 09:23:47 +0000 |
| commit | 43cb0f4738f1e59cf57d957b26a44d4ffcc43702 (patch) | |
| tree | d681ee14bbfb92dabd77f19e45a8cf615a334011 /stoc/source/javavm/javavm.cxx | |
| parent | daf3540645c151c96a6ed1f57ab18bef2202494b (diff) | |
INTEGRATION: CWS sb8 (1.59.18); FILE MERGED
2003/10/06 08:37:02 sb 1.59.18.1: #112127# Set org.openoffice.native Java property in started JVM.
Diffstat (limited to 'stoc/source/javavm/javavm.cxx')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index dd98d40c78a7..a30918536da6 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: javavm.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: vg $ $Date: 2003-06-12 11:08:36 $ + * last change: $Author: vg $ $Date: 2003-10-09 10:23:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1672,7 +1672,7 @@ JavaVM * JavaVirtualMachine::createJavaVM(stoc_javavm::JVM const & jvm, JavaVMInitArgs vm_args; // we have "addOpt" additional properties to those kept in the JVM struct - sal_Int32 addOpt=2; + sal_Int32 addOpt=3; JavaVMOption * options= new JavaVMOption[cprops + addOpt]; rtl::OString sClassPath= rtl::OString("-Djava.class.path=") + rtl::OUStringToOString(jvm.getClassPath(), @@ -1688,6 +1688,12 @@ JavaVM * JavaVirtualMachine::createJavaVM(stoc_javavm::JVM const & jvm, options[1].optionString= "abort"; options[1].extraInfo= (void* )abort_handler; + // Set a flag that this JVM has been created via the JNI Invocation API + // (used, for example, by UNO remote bridges to share a common thread pool + // factory among Java and native bridge implementations): + options[2].optionString = "-Dorg.openoffice.native="; + options[2].extraInfo = 0; + rtl::OString * arProps= new rtl::OString[cprops]; /*If there are entries in the Java section of the java.ini/javarc which are meant |