User: hr Date: 2007-06-27 14:35:22+0000 Modified: dba/connectivity/source/drivers/jdbc/CallableStatement.cxx
Log: INTEGRATION: CWS sdblogging (1.17.84); FILE MERGED 2007/04/12 09:04:11 fs 1.17.84.2: #i76119# ThrowLoggedSQLException instead of ThrowSQLException 2007/04/11 08:53:42 fs 1.17.84.1: #i76119# added logging messages File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: CallableStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/CallableStatement.cxx?r1=1.17&r2=1.18 Delta lines: +23 -23 --------------------- --- CallableStatement.cxx 2006-09-17 02:44:46+0000 1.17 +++ CallableStatement.cxx 2007-06-27 14:35:19+0000 1.18 @@ -78,8 +78,8 @@ //************************************************************** //************ Class: java.sql.CallableStatement //************************************************************** -java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection* _pCon,const ::rtl::OUString& sql ) - : java_sql_PreparedStatement( pEnv, _pCon,sql ) +java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const ::rtl::OUString& sql ) + : java_sql_PreparedStatement( pEnv, _rCon, sql ) { } // ----------------------------------------------------------------------------- @@ -119,7 +119,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; @@ -142,7 +142,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallBooleanMethod( object, mID, columnIndex ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -165,7 +165,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallByteMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -188,7 +188,7 @@ if( mID ){ jbyteArray out(0); out = (jbyteArray)t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); if (out) { jboolean p = sal_False; @@ -218,7 +218,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -241,7 +241,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallDoubleMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -265,7 +265,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallFloatMethod( object, mID, columnIndex ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -289,7 +289,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallIntMethod( object, mID, columnIndex ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -311,7 +311,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallLongMethod( object, mID, columnIndex ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -333,7 +333,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -356,7 +356,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallShortMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -378,7 +378,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ jstring out = (jstring)t.pEnv->CallObjectMethod( object, mID, columnIndex ); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); aStr = JavaString2String(t.pEnv,out); // und aufraeumen } //mID @@ -403,7 +403,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -426,7 +426,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -454,7 +454,7 @@ jstring str = convertwchar_tToJavaString(t.pEnv,typeName); t.pEnv->CallVoidMethod( object, mID, parameterIndex,sqlType,str); t.pEnv->DeleteLocalRef(str); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } } @@ -474,7 +474,7 @@ if( mID ) { t.pEnv->CallVoidMethod( object, mID, parameterIndex,sqlType,scale); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } } @@ -529,7 +529,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -552,7 +552,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -574,7 +574,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -597,7 +597,7 @@ mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); if( mID ){ out = t.pEnv->CallObjectMethod( object, mID, columnIndex); - ThrowSQLException(t.pEnv,*this); + ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); // und aufraeumen } //mID } //t.pEnv @@ -646,7 +646,7 @@ } //mID } t.pEnv->DeleteLocalRef(str); - 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]
