mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java: add STOC_FORCE_NO_JRE env. var to enable easy testing of no-JRE case.

Browse Source
This commit is contained in:
Michael Meeks
2012-02-16 12:38:24 +00:00
parent 4f582dcef0
commit 3823c4fbba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stoc/source/javavm/javavm.cxx
View File

@@ -782,8 +782,12 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
JNIEnv * pMainThreadEnv = 0; JNIEnv * pMainThreadEnv = 0;
javaFrameworkError errcode = JFW_E_NONE; javaFrameworkError errcode = JFW_E_NONE;
errcode = jfw_startVM(arOptions, index, & m_pJavaVm,
& pMainThreadEnv); if (getenv("STOC_FORCE_NO_JRE"))
errcode = JFW_E_NO_SELECT;
else
errcode = jfw_startVM(arOptions, index, & m_pJavaVm,
& pMainThreadEnv);
bool bStarted = false; bool bStarted = false;
switch (errcode) switch (errcode)
@@ -794,6 +798,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
// No Java configured. We silenty run the java configuration // No Java configured. We silenty run the java configuration
// Java. // Java.
javaFrameworkError errFind = jfw_findAndSelectJRE( NULL ); javaFrameworkError errFind = jfw_findAndSelectJRE( NULL );
if (getenv("STOC_FORCE_NO_JRE"))
errFind = JFW_E_NO_JAVA_FOUND;
if (errFind == JFW_E_NONE) if (errFind == JFW_E_NONE)
{ {
continue; continue;