User: hr Date: 05/04/06 03:36:33 Modified: /dba/connectivity/source/drivers/hsqldb/ StorageFileAccess.cxx
Log: INTEGRATION: CWS hsqldb4 (1.4.4); FILE MERGED 2005/03/31 11:53:00 fs 1.4.4.1: #i41785# some more traces 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.4&r2=1.5 Delta lines: +25 -3 -------------------- --- StorageFileAccess.cxx 23 Mar 2005 09:41:21 -0000 1.4 +++ StorageFileAccess.cxx 6 Apr 2005 10:36:30 -0000 1.5 @@ -126,7 +126,7 @@ } catch(Exception& e) { - OSL_ENSURE(0,"Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement"); + OSL_ENSURE(0,"Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement"); if (JNI_FALSE != env->ExceptionCheck()) env->ExceptionClear(); ::rtl::OString cstr( ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); @@ -145,6 +145,12 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement (JNIEnv * env, jobject obj_this,jstring key, jstring name) { +#if OSL_DEBUG_LEVEL > 1 + { + ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); + ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); + } +#endif TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); if ( aStoragePair.first.first.is() ) { @@ -159,7 +165,7 @@ } catch(Exception& e) { - OSL_ENSURE(0,"Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement"); + OSL_ENSURE(0,"Exception catched! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement"); StorageContainer::throwJavaException(e,env); } } @@ -174,12 +180,28 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement (JNIEnv * env, jobject obj_this,jstring key, jstring oldname, jstring newname) { +#if OSL_DEBUG_LEVEL > 1 + { + ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); + ::rtl::OUString sNewName = StorageContainer::jstring2ustring(env,newname); + ::rtl::OUString sOldName = StorageContainer::jstring2ustring(env,oldname); + } +#endif TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); if ( aStoragePair.first.first.is() ) { try { - aStoragePair.first.first->renameElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,oldname),aStoragePair.first.second),StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second)); + aStoragePair.first.first->renameElement( + StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,oldname),aStoragePair.first.second), + StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second) + ); +#if OSL_DEBUG_LEVEL > 1 + { + ::rtl::OUString sNewName = StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second); + OSL_ENSURE(aStoragePair.first.first->isStreamElement(sNewName),"Stream could not be renamed"); + } +#endif } catch(NoSuchElementException&) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
