Kaydet (Commit) 42904202 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Make Java-based connectivity drivers work with jvmfwk "direct mode"

...so they work from CppunitTests (which make use of that "direct mode").

Change-Id: I92b72fb708ac1868644111b208f92ac58610ed11
üst a041f518
...@@ -400,7 +400,21 @@ namespace connectivity ...@@ -400,7 +400,21 @@ namespace connectivity
sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException)
{ {
sal_Bool bEnabled = sal_False; sal_Bool bEnabled = sal_False;
OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" ); javaFrameworkError e = jfw_getEnabled(&bEnabled);
switch (e) {
case JFW_E_NONE:
break;
case JFW_E_DIRECT_MODE:
SAL_INFO(
"connectivity.hsqldb",
"jfw_getEnabled: JFW_E_DIRECT_MODE, assuming true");
bEnabled = true;
break;
default:
SAL_WARN(
"connectivity.hsqldb", "jfw_getEnabled: error code " << +e);
break;
}
return bEnabled && url.equals("sdbc:embedded:hsqldb"); return bEnabled && url.equals("sdbc:embedded:hsqldb");
} }
......
...@@ -117,7 +117,20 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLEx ...@@ -117,7 +117,20 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLEx
// don't ask the real driver for the url // don't ask the real driver for the url
// I feel responsible for all jdbc url's // I feel responsible for all jdbc url's
sal_Bool bEnabled = sal_False; sal_Bool bEnabled = sal_False;
OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" ); javaFrameworkError e = jfw_getEnabled(&bEnabled);
switch (e) {
case JFW_E_NONE:
break;
case JFW_E_DIRECT_MODE:
SAL_INFO(
"connectivity.jdbc",
"jfw_getEnabled: JFW_E_DIRECT_MODE, assuming true");
bEnabled = true;
break;
default:
SAL_WARN("connectivity.jdbc", "jfw_getEnabled: error code " << +e);
break;
}
return bEnabled && url.startsWith("jdbc:"); return bEnabled && url.startsWith("jdbc:");
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
......
...@@ -58,6 +58,8 @@ certain functionality. ...@@ -58,6 +58,8 @@ certain functionality.
@li @c connectivity.commontools @li @c connectivity.commontools
@li @c connectivity.drivers @li @c connectivity.drivers
@li @c connectivity.firebird @li @c connectivity.firebird
@li @c connectivity.hsqldb
@li @c connectivity.jdbc
@li @c connectivity.mork @li @c connectivity.mork
@li @c connectivity.flat @li @c connectivity.flat
@li @c connectivity.parse @li @c connectivity.parse
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment