Tag: cws_src680_warnings01 User: pl Date: 05/11/07 11:09:20 Modified: /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx
Log: RESYNC: (1.14-1.15); FILE MERGED 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.8.1&r2=1.14.8.2 Delta lines: +37 -33 --------------------- --- HDriver.cxx 7 Nov 2005 14:43:36 -0000 1.14.8.1 +++ HDriver.cxx 7 Nov 2005 19:09:17 -0000 1.14.8.2 @@ -483,8 +483,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); @@ -546,6 +547,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 >()))); @@ -575,6 +578,7 @@ { OSL_ENSURE( false, "ODriverDelegator::preCommit: caught an exception!" ); } + } } } //------------------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
