summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-04-11 18:33:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-04-11 18:33:31 +0200
commit33cf2b6613da36863f6f64a7ac1e413ac1e641ff (patch)
tree8f78915f53443f3e3931b4a7d3a1ea12cf069ef0 /jvmfwk
parent16f29aa720c3f1a27f1ee6898630b10b897899c8 (diff)
Let jfw_isVMRunning return the result; there are no error conditions
Change-Id: I004b3d6f6b7b32d1bb41072d7fdd4a66f944d992
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/source/framework.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 8447d320aae6..751068cabf0e 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -684,16 +684,10 @@ javaFrameworkError jfw_getSelectedJRE(std::unique_ptr<JavaInfo> *ppInfo)
return errcode;
}
-javaFrameworkError jfw_isVMRunning(bool *bRunning)
+bool jfw_isVMRunning()
{
osl::MutexGuard guard(jfw::FwkMutex::get());
- if (bRunning == nullptr)
- return JFW_E_INVALID_ARG;
- if (g_pJavaVM == nullptr)
- *bRunning = false;
- else
- *bRunning = true;
- return JFW_E_NONE;
+ return g_pJavaVM != nullptr;
}
javaFrameworkError jfw_getJavaInfoByPath(rtl_uString *pPath, std::unique_ptr<JavaInfo> *ppInfo)