diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-12-03 19:20:05 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-12-03 19:20:05 +0100 |
| commit | e498ea80702bba99caef311d2d1092f316134f2b (patch) | |
| tree | ec7e299e1afad152e500bd6c3288b02ca02604f6 | |
| parent | bab079cbb5bfefeeedd505fd310805eaa4ba69af (diff) | |
| parent | 9ce205f4769bc01cd271ff9b96c9ec2438162bab (diff) | |
CWS-TOOLING: integrate CWS tkr29_DEV300
| -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); } // ------------------------------------------------------------------- |