User: hr Date: 06/06/19 18:34:54 Modified: /dba/connectivity/source/drivers/jdbc/ Object.cxx
Log: INTEGRATION: CWS warnings01 (1.20.30); FILE MERGED 2005/12/22 11:44:51 fs 1.20.30.3: #i57457# warning-free code 2005/11/21 10:07:48 fs 1.20.30.2: #i57457# warning-free code on unx* 2005/11/07 14:43:42 fs 1.20.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: Object.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/Object.cxx?r1=1.20&r2=1.21 Delta lines: +13 -13 --------------------- --- Object.cxx 8 Sep 2005 06:11:09 -0000 1.20 +++ Object.cxx 20 Jun 2006 01:34:52 -0000 1.21 @@ -138,7 +138,7 @@ } // der eigentliche Konstruktor java_lang_Object::java_lang_Object(const Reference<XMultiServiceFactory >& _rxFactory) - : object( 0 ),m_xFactory(_rxFactory) + : m_xFactory(_rxFactory),object( 0 ) { SDBThreadAttach::addRef(); } @@ -198,8 +198,8 @@ if( t.pEnv ) { // temporaere Variable initialisieren - static char * cSignature = "()Ljava/lang/Class;"; - static char * cMethodName = "getClass"; + static const char * cSignature = "()Ljava/lang/Class;"; + static const char * cMethodName = "getClass"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -214,7 +214,7 @@ return NULL; } -::rtl::OUString java_lang_Object::toString() +::rtl::OUString java_lang_Object::toString() const { SDBThreadAttach t; @@ -222,8 +222,8 @@ if( t.pEnv ) { // temporaere Variable initialisieren - static char * cSignature = "()Ljava/lang/String;"; - static char * cMethodName = "toString"; + static const char * cSignature = "()Ljava/lang/String;"; + static const char * cMethodName = "toString"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -240,8 +240,8 @@ // -------------------------------------------------------------------------------- void java_lang_Object::ThrowSQLException(JNIEnv * pEnv,const Reference< XInterface> & _rContext) throw(SQLException, RuntimeException) { - jthrowable jThrow = NULL; - if(pEnv && (jThrow = pEnv->ExceptionOccurred())) + jthrowable jThrow = pEnv ? pEnv->ExceptionOccurred() : NULL; + if ( jThrow ) { pEnv->ExceptionClear();// we have to clear the exception here because we want to handle it itself if(pEnv->IsInstanceOf(jThrow,java_sql_SQLException_BASE::getMyClass())) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
