diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:03:52 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:03:52 +0200 |
| commit | 4065fa62cd9e25056e8ff18cdc3b9d144960bd18 (patch) | |
| tree | 79f6d875a54af2018caa3a16dbfcbe354b9bd4a6 | |
| parent | a8708cedf6b0f9cf3d18c1e4c6e881185b98accf (diff) | |
| parent | 7d9bce7ca0408786d0ad448dee0f2bf480870d3e (diff) | |
CWS-TOOLING: integrate CWS jl153_OOO330
| -rw-r--r-- | configmgr/source/xcuparser.cxx | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/DAVResourceAccess.cxx | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index eda478b18b70..cd1e6e55d085 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -196,6 +196,14 @@ bool XcuParser::startElement( { handleSetNode( reader, dynamic_cast< SetNode * >(state_.top().node.get())); + } else if (ns == XmlReader::NAMESPACE_NONE && + name.equals(RTL_CONSTASCII_STRINGPARAM("prop"))) + { + OSL_TRACE( + "configmgr bad set node <prop> member in %s", + rtl::OUStringToOString( + reader.getUrl(), RTL_TEXTENCODING_UTF8).getStr()); + state_.push(State(true)); // ignored } else { throw css::uno::RuntimeException( (rtl::OUString( diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 872d45405735..e4617b7b9ea7 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -1201,8 +1201,7 @@ sal_Bool DAVResourceAccess::handleException( DAVException & e, int errorCount ) // if we have a bad connection try again. Up to three times. case DAVException::DAV_HTTP_ERROR: // retry up to three times, if not a client-side error. - if ( e.getStatus() > 0 && - ( e.getStatus() < 400 || e.getStatus() > 499 ) && + if ( ( e.getStatus() < 400 || e.getStatus() >= 500 ) && errorCount < 3 ) { return sal_True; |