User: kz Date: 05/01/21 08:41:28 Modified: /dba/connectivity/source/drivers/jdbc/ Connection.cxx
Log: INTEGRATION: CWS dba22 (1.20.16); FILE MERGED 2005/01/04 11:45:55 oj 1.20.16.4: #i39671# erase guard when no longer needed 2005/01/04 11:45:20 oj 1.20.16.3: #i39671# erase guard when no longer needed 2005/01/03 14:13:22 oj 1.20.16.2: #i39322# remove static in front of driver method id 2004/12/13 10:18:34 oj 1.20.16.1: #i38512# check if object is set before accessing JVM File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: Connection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/Connection.cxx?r1=1.20&r2=1.21 Delta lines: +16 -13 --------------------- --- Connection.cxx 9 Nov 2004 12:12:02 -0000 1.20 +++ Connection.cxx 21 Jan 2005 16:41:26 -0000 1.21 @@ -169,8 +169,10 @@ m_aStatements.clear(); m_xMetaData = WeakReference< XDatabaseMetaData>(); + if ( object ) + { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment gel�scht worden!"); - if( t.pEnv && object ){ + if( t.pEnv ){ // temporaere Variable initialisieren static char * cSignature = "()V"; static char * cMethodName = "close"; @@ -182,6 +184,7 @@ t.pEnv->CallVoidMethod( object, mID); ThrowSQLException(t.pEnv,*this); } //t.pEnv + } } // ------------------------------------------------------------------------- jclass java_sql_Connection::getMyClass() @@ -820,7 +823,7 @@ static char * cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;"; static char * cMethodName = "connect"; // Java-Call absetzen - static jmethodID mID = NULL; + jmethodID mID = NULL; if ( !mID ) mID = t.pEnv->GetMethodID( m_Driver_theClass, cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); ThrowSQLException(t.pEnv,*this); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
