diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-08-05 09:51:16 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-08-05 09:51:16 +0200 |
| commit | c2247cb7524a6e00647b6120cd2fb3f36377ff0e (patch) | |
| tree | dd6eed4d1e33f963f2daf7153c6e0e83eb0b016a /ucb/source | |
| parent | 8dfe965a32b7d99d5bd70489f5f45652114ca889 (diff) | |
| parent | 0e6f37318dd855bd04e3281435d1af751398c98f (diff) | |
dr77: rebase to m86
Diffstat (limited to 'ucb/source')
| -rwxr-xr-x[-rw-r--r--] | ucb/source/core/cmdenv.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/DAVResourceAccess.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 0f425e814400..5c0136fab063 100644..100755 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -183,7 +183,7 @@ UcbCommandEnvironment::createServiceFactory( const uno::Reference< lang::XMultiServiceFactory >& rxServiceMgr ) { return uno::Reference< lang::XSingleServiceFactory >( - cppu::createOneInstanceFactory( + cppu::createSingleFactory( rxServiceMgr, UcbCommandEnvironment::getImplementationName_Static(), UcbCommandEnvironment_CreateInstance, 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; |