diff options
| author | sb <sb@openoffice.org> | 2009-12-10 17:46:18 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-12-10 17:46:18 +0100 |
| commit | d9164f354a8951ad220d5ae937517228296d1922 (patch) | |
| tree | 17bcc6282d3708c3331a59513fb40ccefeaaad4b /ucb | |
| parent | b069d0fabfa30848596bdc106380f75a725b686e (diff) | |
| parent | 875ac20478f16e5107acb222c0b851b99d2e0f27 (diff) | |
sb111: merged in DEV300_m67
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav/DAVResourceAccess.cxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/NeonSession.cxx | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 67f8e5a386f0..140b3dd3af94 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -555,8 +555,9 @@ void DAVResourceAccess::GET( void DAVResourceAccess::ABORT() throw( DAVException ) { - initialize(); - m_xSession->ABORT(); + // 17.11.09 (tkr): abort currently disabled caused by issue i106766 + // initialize(); + // m_xSession->ABORT(); } //========================================================================= namespace { diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index b455ffebbb9b..5d1ba2d6927c 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -1319,8 +1319,11 @@ void NeonSession::POST( const rtl::OUString & inPath, void NeonSession::ABORT() throw ( DAVException ) { - if (NULL !=m_pHttpSession) - ne_close_connection(m_pHttpSession); + // 11.11.09 (tkr): The following code lines causing crashes if closing a ongoing connection. It turned out that this existing solution doesn't work in multi-threading environments. + // So I disabled them in 3.2. . Issue #73893# should fix it in OOo 3.3. + + //if (NULL !=m_pHttpSession) + // ne_close_connection(m_pHttpSession); } // ------------------------------------------------------------------- |