diff options
| -rw-r--r-- | sal/inc/sal/log-areas.dox | 1 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox index 384f211dd915..dfe78cbad563 100644 --- a/sal/inc/sal/log-areas.dox +++ b/sal/inc/sal/log-areas.dox @@ -198,6 +198,7 @@ certain functionality. @li @c cmisucp @li @c ucb.ucp +@li @c ucb.ucp.webdav @section unotools diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 96fdd68d10af..61f4969308d0 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -553,10 +553,8 @@ void DAVResourceAccess::GET( void DAVResourceAccess::abort() throw( DAVException ) { - // 17.11.09 (tkr): abort currently disabled caused by issue i106766 - // initialize(); - // m_xSession->abort(); - OSL_TRACE( "Not implemented. -> #i106766#" ); + initialize(); + m_xSession->abort(); } //========================================================================= diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 5dbbefd707df..2ff06aec7854 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1657,11 +1657,7 @@ bool NeonSession::UNLOCK( NeonLock * pLock ) void NeonSession::abort() throw ( DAVException ) { - if ( m_pHttpSession ) - { - osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex ); - ne_close_connection( m_pHttpSession ); - } + SAL_INFO("ucb.ucp.webdav", "neon commands cannot be aborted"); } // ------------------------------------------------------------------- |