diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-15 11:24:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-15 11:30:42 +0200 |
| commit | 3b48b3cc92c93911f61535d22a2c8731574ee51a (patch) | |
| tree | 2602c98df9d414d803e94bf9f80780d4395b8d8f /stoc | |
| parent | b79b5e0df6dc5a0ba18054b0503d6fa804b69f02 (diff) | |
loplugin:singlevalfields in sc..vcl
Change-Id: I68752a3daf5ddd8581c07759b8be2c1dabbb9258
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 7 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.hxx | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index abf287f9c595..87196d5e9d63 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -557,7 +557,6 @@ JavaVirtualMachine::JavaVirtualMachine( m_xContext(rContext), m_bDisposed(false), m_pJavaVm(nullptr), - m_bDontCreateJvm(false), m_aAttachGuards(destroyAttachGuards) // TODO check for validity {} @@ -665,12 +664,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) jfw::JavaInfoGuard info; while (!m_xVirtualMachine.is()) // retry until successful { - // This is the second attempt to create Java. m_bDontCreateJvm is - // set which means instantiating the JVM might crash. - if (m_bDontCreateJvm) - //throw css::uno::RuntimeException(); - return css::uno::Any(); - stoc_javavm::JVM aJvm; initVMConfiguration(&aJvm, m_xContext->getServiceManager(), m_xContext); diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index 8e354a8c1a35..f4ebabd48f7f 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -142,8 +142,6 @@ private: rtl::Reference< jvmaccess::VirtualMachine > m_xVirtualMachine; rtl::Reference< jvmaccess::UnoVirtualMachine > m_xUnoVirtualMachine; JavaVM * m_pJavaVm; - // stored as an instance member for backwards compatibility in getJavaVM - bool m_bDontCreateJvm; // If the first creation of Java failed and this flag is set then the // next call to getJavaVM throws a RuntimException. This is useful when // the second attempt to create Java might cause a crash. |