User: vg Date: 05/03/23 01:41:24 Modified: /dba/connectivity/source/drivers/hsqldb/ StorageFileAccess.cxx
Log: INTEGRATION: CWS dba26 (1.3.14); FILE MERGED 2005/03/15 15:30:01 fs 1.3.14.2: reverted parts of the previous change - OJ's patch contained too much code :( 2005/03/15 15:05:02 fs 1.3.14.1: #i44582# (patch provided by OJ) refined storage handling File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: StorageFileAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx?r1=1.3&r2=1.4 Delta lines: +4 -17 -------------------- --- StorageFileAccess.cxx 16 Feb 2005 15:52:12 -0000 1.3 +++ StorageFileAccess.cxx 23 Mar 2005 09:41:21 -0000 1.4 @@ -131,9 +131,6 @@ env->ExceptionClear(); ::rtl::OString cstr( ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); - ThrowException( env, - "java/io/IOException", - cstr.getStr()); } } return JNI_FALSE; @@ -157,17 +154,13 @@ } catch(NoSuchElementException&) { + if (JNI_FALSE != env->ExceptionCheck()) + env->ExceptionClear(); } catch(Exception& e) { OSL_ENSURE(0,"Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement"); - if (JNI_FALSE != env->ExceptionCheck()) - env->ExceptionClear(); - ::rtl::OString cstr( ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); - OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); - ThrowException( env, - "java/io/IOException", - cstr.getStr()); + StorageContainer::throwJavaException(e,env); } } } @@ -194,13 +187,7 @@ catch(Exception& e) { OSL_ENSURE(0,"Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement"); - if (JNI_FALSE != env->ExceptionCheck()) - env->ExceptionClear(); - ::rtl::OString cstr( ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); - OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); - ThrowException( env, - "java/io/IOException", - cstr.getStr()); + StorageContainer::throwJavaException(e,env); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
