summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-11-23 15:37:14 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-11-23 15:37:14 +0000
commitccbbbc821d52f4aea292663f10d8eec5a05f1fa4 (patch)
tree25885176e8d4421d863735c0fdbba9fd444ae9f9
parent0066f54e3b1b17be8da0daf902d6d84b46d4367b (diff)
CWS-TOOLING: integrate CWS tkr29
2009-11-17 09:00:39 +0100 tkr r277528 : #i106766# ::Abort Method disabled 2009-11-12 07:37:32 +0100 tkr r277468 : #i106766# Disable XCommandProcessor::Abort
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx5
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx7
2 files changed, 8 insertions, 4 deletions
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index e203c897c8..f26caaedc2 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 338d58445f..2600c10c51 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);
}
// -------------------------------------------------------------------