User: hr Date: 05/09/23 04:39:27 Modified: /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx
Log: INTEGRATION: CWS dba201b (1.12.12); FILE MERGED 2005/09/21 08:12:50 oj 1.12.12.3: RESYNC: (1.13-1.14); FILE MERGED 2005/07/12 07:06:56 oj 1.12.12.2: #i51821# increment pLookup by 2 2005/07/11 13:56:39 fs 1.12.12.1: merging CWS dba201a into dba201b File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.14&r2=1.15 Delta lines: +32 -28 --------------------- --- HDriver.cxx 8 Sep 2005 06:03:14 -0000 1.14 +++ HDriver.cxx 23 Sep 2005 11:39:24 -0000 1.15 @@ -481,8 +481,9 @@ } if ( bLastOne ) { - Reference<XTransactionListener> xListener(*this,UNO_QUERY); - StorageContainer::revokeStorage(_aIter->second.first,xListener); + // Reference<XTransactionListener> xListener(*this,UNO_QUERY); + // a shutdown should commit all changes to the db files + StorageContainer::revokeStorage(_aIter->second.first,NULL); } if ( !m_bInShutDownConnections ) m_aConnections.erase(_aIter); @@ -544,6 +545,8 @@ Reference< XStorage> xStorage(aEvent.Source,UNO_QUERY); ::rtl::OUString sKey = StorageContainer::getRegisteredKey(xStorage); + if ( sKey.getLength() ) + { TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::std::compose1( ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey) ,::std::compose1(::std::select1st<TWeakConnectionPair>(),::std::select2nd< TWeakPair >()))); @@ -573,6 +576,7 @@ { OSL_ENSURE( false, "ODriverDelegator::preCommit: caught an exception!" ); } + } } } //------------------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
