diff options
Diffstat (limited to 'ucb/source')
-rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 10 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 88 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.hxx | 5 |
3 files changed, 59 insertions, 44 deletions
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 29e1b9124784..4cad6911abe2 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -228,8 +228,14 @@ XResultSet_impl::OneMore() } else if( err == osl::FileBase::E_None ) { - aRow = m_pMyShell->getv( - this, m_sProperty, aDirIte, aUnqPath, IsRegular ); + if (!m_pMyShell->getv( + this, m_sProperty, aDirIte, aUnqPath, IsRegular, aRow )) + { + SAL_WARN( + "ucb.ucp.file", + "getting dir item in <" << m_aBaseDirectory << "> failed"); + continue; + } if( m_nOpenMode == ucb::OpenMode::DOCUMENTS && IsRegular ) { diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index fbe93ed955f8..e78bb9ed46eb 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -2528,13 +2528,14 @@ TaskManager::commit( const TaskManager::ContentMap::iterator& it, // directoryitem, which is returned by osl::DirectoryItem::getNextItem() -uno::Reference< sdbc::XRow > SAL_CALL +bool SAL_CALL TaskManager::getv( Notifier* pNotifier, const uno::Sequence< beans::Property >& properties, osl::DirectoryItem& aDirItem, OUString& aUnqPath, - bool& aIsRegular ) + bool& aIsRegular, + uno::Reference< sdbc::XRow > & row ) { uno::Sequence< uno::Any > seq( properties.getLength() ); @@ -2548,57 +2549,64 @@ TaskManager::getv( osl_FileStatus_Mask_LinkTargetURL ); osl::FileBase::RC aRes = aDirItem.getFileStatus( aFileStatus ); - if ( aRes == osl::FileBase::E_None ) + if ( aRes != osl::FileBase::E_None ) { - aUnqPath = aFileStatus.getFileURL(); + SAL_WARN( + "ucb.ucp.file", + "osl::DirectoryItem::getFileStatus failed with " << +aRes); + return false; + } + + aUnqPath = aFileStatus.getFileURL(); - // If the directory item type is a link retrieve the type of the target + // If the directory item type is a link retrieve the type of the target - if ( aFileStatus.getFileType() == osl::FileStatus::Link ) + if ( aFileStatus.getFileType() == osl::FileStatus::Link ) + { + // Assume failure + aIsRegular = false; + osl::FileBase::RC result = osl::FileBase::E_INVAL; + osl::DirectoryItem aTargetItem; + osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem ); + if ( aTargetItem.is() ) { - // Assume failure - aIsRegular = false; - osl::FileBase::RC result = osl::FileBase::E_INVAL; - osl::DirectoryItem aTargetItem; - osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem ); - if ( aTargetItem.is() ) - { - osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type ); + osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type ); - if ( osl::FileBase::E_None == - ( result = aTargetItem.getFileStatus( aTargetStatus ) ) ) - aIsRegular = - aTargetStatus.getFileType() == osl::FileStatus::Regular; - } + if ( osl::FileBase::E_None == + ( result = aTargetItem.getFileStatus( aTargetStatus ) ) ) + aIsRegular = + aTargetStatus.getFileType() == osl::FileStatus::Regular; } - else - aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular; + } + else + aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular; - registerNotifier( aUnqPath,pNotifier ); - insertDefaultProperties( aUnqPath ); - { - osl::MutexGuard aGuard( m_aMutex ); + registerNotifier( aUnqPath,pNotifier ); + insertDefaultProperties( aUnqPath ); + { + osl::MutexGuard aGuard( m_aMutex ); - TaskManager::ContentMap::iterator it = m_aContent.find( aUnqPath ); - commit( it,aFileStatus ); + TaskManager::ContentMap::iterator it = m_aContent.find( aUnqPath ); + commit( it,aFileStatus ); - TaskManager::PropertySet::iterator it1; - PropertySet& propset = *(it->second.properties); + TaskManager::PropertySet::iterator it1; + PropertySet& propset = *(it->second.properties); - for( sal_Int32 i = 0; i < seq.getLength(); ++i ) - { - MyProperty readProp( properties[i].Name ); - it1 = propset.find( readProp ); - if( it1 == propset.end() ) - seq[i] = uno::Any(); - else - seq[i] = it1->getValue(); - } + for( sal_Int32 i = 0; i < seq.getLength(); ++i ) + { + MyProperty readProp( properties[i].Name ); + it1 = propset.find( readProp ); + if( it1 == propset.end() ) + seq[i] = uno::Any(); + else + seq[i] = it1->getValue(); } - deregisterNotifier( aUnqPath,pNotifier ); } + deregisterNotifier( aUnqPath,pNotifier ); + XRow_impl* p = new XRow_impl( this,seq ); - return uno::Reference< sdbc::XRow >( p ); + row = uno::Reference< sdbc::XRow >( p ); + return true; } diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 2a427c6adaa6..24e719b3ebb8 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -585,12 +585,13 @@ namespace fileaccess // Special optimized method for getting the properties of a directoryitem, which // is returned by osl::DirectoryItem::getNextItem() - css::uno::Reference< css::sdbc::XRow > SAL_CALL + bool SAL_CALL getv( Notifier* pNotifier, const css::uno::Sequence< css::beans::Property >& properties, osl::DirectoryItem& DirItem, OUString& aUnqPath, - bool& bIsRegular ); + bool& bIsRegular, + css::uno::Reference< css::sdbc::XRow > & row ); /** |