summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-21 15:41:43 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-21 15:41:43 +0000
commita0e9a04f5744ea4d1fc86bdece57551bfe2e3b76 (patch)
tree852a579d614a5803897aa12bbdf8181163d4fa3b /connectivity
parent6943e3aa02a4ffe07b3491227a6f51cfcbf1aa18 (diff)
INTEGRATION: CWS dba22 (1.6.16); FILE MERGED
2005/01/04 11:45:20 oj 1.6.16.1: #i39671# erase guard when no longer needed
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/jdbc/DriverManager.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/drivers/jdbc/DriverManager.cxx b/connectivity/source/drivers/jdbc/DriverManager.cxx
index bbade6f913..88cda66c3d 100644
--- a/connectivity/source/drivers/jdbc/DriverManager.cxx
+++ b/connectivity/source/drivers/jdbc/DriverManager.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DriverManager.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: hr $ $Date: 2004-11-09 12:12:30 $
+ * last change: $Author: kz $ $Date: 2005-01-21 16:41:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -111,7 +111,7 @@ jobject java_sql_DriverManager::getDriver(const ::rtl::OUString &url)
static char * cSignature = "(Ljava/lang/String;)Ljava/sql/Driver;";
static char * cMethodName = "getDriver";
// Java-Call absetzen
- jmethodID mID = t.pEnv->GetStaticMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!");
+ static jmethodID mID = t.pEnv->GetStaticMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!");
if( mID )
{
out = t.pEnv->CallStaticObjectMethod( getMyClass(), mID, args[0].l );
@@ -136,7 +136,7 @@ void java_sql_DriverManager::setLoginTimeout(sal_Int32 _par0)
static char * cSignature = "(I)V";
static char * cMethodName = "setLoginTimeout";
// Java-Call absetzen
- jmethodID mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!");
+ static jmethodID mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!");
if( mID )
t.pEnv->CallStaticVoidMethod(getMyClass(), mID, _par0);
ThrowSQLException(t.pEnv,0);