User: vg Date: 05/02/17 02:15:08 Modified: /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx
Log: INTEGRATION: CWS dba23 (1.2.22); FILE MERGED 2005/02/03 07:31:13 oj 1.2.22.2: RESYNC: (1.2-1.3); FILE MERGED 2005/01/20 16:34:00 oj 1.2.22.1: #i40970# check if java is enabled File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.4&r2=1.5 Delta lines: +7 -6 ------------------- --- HDriver.cxx 16 Feb 2005 15:50:29 -0000 1.4 +++ HDriver.cxx 17 Feb 2005 10:15:06 -0000 1.5 @@ -86,6 +86,9 @@ #include "TConnection.hxx" #endif #include "hsqldb/HStorageMap.hxx" +#ifndef INCLUDED_JVMFWK_FRAMEWORK_H +#include <jvmfwk/framework.h> +#endif #ifndef _COM_SUN_STAR_REFLECTION_XPROXYFACTORY_HPP_ #include <com/sun/star/reflection/XProxyFactory.hpp> #endif @@ -314,12 +317,10 @@ //-------------------------------------------------------------------- sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException) { - { // initialize the java vm - ::rtl::Reference< jvmaccess::VirtualMachine > xTest = ::connectivity::getJavaVM(m_xFactory); - if ( !xTest.is() ) - return sal_False; - } - return url.compareToAscii("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")) == 0; + sal_Bool bEnabled = sal_False; + javaFrameworkError eErr = jfw_getEnabled( &bEnabled ); + OSL_ENSURE( JFW_E_NONE == eErr,"error in jfw_getEnabled" ); + return bEnabled && url.compareToAscii("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")) == 0; } //-------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
