Tag: cws_src680_sdblogging User: fs Date: 2007/04/12 02:04:37 Modified: dba/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx dba/connectivity/source/drivers/jdbc/JConnection.cxx
Log: #i76119# ThrowLoggedSQLException instead of ThrowSQLException File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: DatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx?r1=1.24.48.1&r2=1.24.48.2 Delta lines: +24 -24 --------------------- --- DatabaseMetaData.cxx 11 Apr 2007 13:51:11 -0000 1.24.48.1 +++ DatabaseMetaData.cxx 12 Apr 2007 09:04:34 -0000 1.24.48.2 @@ -4,9 +4,9 @@ * * $RCSfile: DatabaseMetaData.cxx,v $ * - * $Revision: 1.24.48.1 $ + * $Revision: 1.24.48.2 $ * - * last change: $Author: fs $ $Date: 2007/04/11 13:51:11 $ + * last change: $Author: fs $ $Date: 2007/04/12 09:04:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -247,7 +247,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns( @@ -398,14 +398,14 @@ t.pEnv->DeleteLocalRef((jstring)args[1].l); if(table.getLength()) t.pEnv->DeleteLocalRef((jstring)args[2].l); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } if ( !out ) return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier( @@ -440,7 +440,7 @@ t.pEnv->DeleteLocalRef((jstring)args[1].l); if(table.getLength()) t.pEnv->DeleteLocalRef((jstring)args[2].l); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -448,7 +448,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( @@ -570,7 +570,7 @@ t.pEnv->DeleteLocalRef((jstring)args[4].l); if(foreignTable.getLength()) t.pEnv->DeleteLocalRef((jstring)args[5].l); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -578,7 +578,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); } // ------------------------------------------------------------------------- @@ -601,7 +601,7 @@ if ( _inout_MethodID ) { out = t.pEnv->CallBooleanMethod( object, _inout_MethodID ); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -629,7 +629,7 @@ if ( _inout_MethodID ) { jstring out = (jstring)t.pEnv->CallObjectMethod( object, _inout_MethodID ); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); sReturn = JavaString2String( t.pEnv, out ); } } @@ -665,7 +665,7 @@ if ( _inout_MethodID ) { out = t.pEnv->CallIntMethod( object, _inout_MethodID ); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -692,7 +692,7 @@ if ( _inout_MethodID ) { out = t.pEnv->CallBooleanMethod( object, _inout_MethodID, _nArgument ); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -720,7 +720,7 @@ if ( _inout_MethodID ) { out = t.pEnv->CallObjectMethod( object, _inout_MethodID ); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -728,7 +728,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, _pMethodName ); - return new java_sql_ResultSet( t.pEnv, out ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); } // ------------------------------------------------------------------------- @@ -792,7 +792,7 @@ if ( args[3].l ) t.pEnv->DeleteLocalRef( (jstring)args[3].l ); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -800,7 +800,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, _pMethodName ); - return new java_sql_ResultSet( t.pEnv, out ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); } // ------------------------------------------------------------------------- @@ -1140,7 +1140,7 @@ if ( mID ) { out = t.pEnv->CallBooleanMethod( object, mID, fromType, toType ); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -1488,7 +1488,7 @@ if ( mID ) { out = t.pEnv->CallBooleanMethod( object, mID, setType, concurrency); - ThrowSQLException( t.pEnv, *this ); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } @@ -1592,11 +1592,11 @@ t.pEnv->DeleteLocalRef((jstring)args[2].l); if(args[3].l) t.pEnv->DeleteLocalRef((jintArray)args[3].l); - ThrowSQLException(t.pEnv,*this); - } //mID - } //t.pEnv - // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return out ? new java_sql_ResultSet( t.pEnv, out ) : 0; + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); + } + } + + return out ? new java_sql_ResultSet( t.pEnv, out, m_aLogger ) : 0; } // ------------------------------------------------------------------------- Reference< XConnection > SAL_CALL java_sql_DatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException) File [changed]: JConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JConnection.cxx?r1=1.3.4.2&r2=1.3.4.3 Delta lines: +22 -22 --------------------- --- JConnection.cxx 11 Apr 2007 13:51:33 -0000 1.3.4.2 +++ JConnection.cxx 12 Apr 2007 09:04:34 -0000 1.3.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: JConnection.cxx,v $ * - * $Revision: 1.3.4.2 $ + * $Revision: 1.3.4.3 $ * - * last change: $Author: fs $ $Date: 2007/04/11 13:51:33 $ + * last change: $Author: fs $ $Date: 2007/04/12 09:04:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -163,7 +163,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ) t.pEnv->CallVoidMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //t.pEnv } } @@ -209,7 +209,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ jstring out = (jstring)t.pEnv->CallObjectMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); aStr = JavaString2String(t.pEnv,out); } //mID } //t.pEnv @@ -239,7 +239,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ) out = t.pEnv->CallObjectMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //t.pEnv if(out) { @@ -275,7 +275,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ t.pEnv->CallVoidMethod( object, mID ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //mID } //t.pEnv } @@ -297,7 +297,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallBooleanMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //mID } //t.pEnv return out && java_sql_Connection_BASE::rBHelper.bDisposed; @@ -321,7 +321,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallBooleanMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //mID } //t.pEnv return out; @@ -349,7 +349,7 @@ t.pEnv->CallVoidMethod( object, mID, str ); t.pEnv->DeleteLocalRef(str); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } //t.pEnv } @@ -371,7 +371,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ t.pEnv->CallVoidMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //mID } //t.pEnv } @@ -395,7 +395,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ) out = t.pEnv->CallBooleanMethod( object, mID ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //t.pEnv return out; } @@ -418,7 +418,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ t.pEnv->CallVoidMethod( object, mID, (jboolean)readOnly ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -442,7 +442,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ t.pEnv->CallVoidMethod( object, mID, (jboolean)autoCommit ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -467,7 +467,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! @@ -502,7 +502,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ) out = t.pEnv->CallIntMethod( object, mID ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //t.pEnv return out; } @@ -524,7 +524,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ t.pEnv->CallVoidMethod( object, mID, level ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -631,7 +631,7 @@ jobject out = t.pEnv->CallObjectMethod( object, mID, str ); t.pEnv->DeleteLocalRef(str); aStr = JavaString2String(t.pEnv, (jstring)out ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //mID } //t.pEnv @@ -658,7 +658,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ t.pEnv->CallVoidMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } } @@ -681,7 +681,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! @@ -802,7 +802,7 @@ jmethodID mID = NULL; if ( !mID ) mID = t.pEnv->GetMethodID( m_Driver_theClass, cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); if( mID ) { jvalue args[2]; @@ -817,7 +817,7 @@ try { - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } catch(const SQLException& ) { @@ -828,7 +828,7 @@ // und aufraeumen t.pEnv->DeleteLocalRef((jstring)args[0].l); delete pProps; - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); if ( out ) object = t.pEnv->NewGlobalRef( out ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
