diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-12-09 20:32:23 +0000 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-12-14 12:50:17 +0100 |
| commit | 39f5301bdfa200b092da69718c84d19acaac0791 (patch) | |
| tree | 3a5c041affea56088f45b5a9054bc6d327377f8f | |
| parent | d565aa114b1c8533bb267d5635a6af19e6536ffa (diff) | |
Resolves: rhbz#661809 ne_simple_propfind can touch gcrypt as well
Signed-off-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx index 3946eb0ccb..dc5ed6d428 100644 --- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx @@ -260,6 +260,8 @@ extern "C" void NPFR_propnames_results( void* userdata, theResources->push_back( theResource ); } +extern osl::Mutex aGlobalNeonMutex; + // ------------------------------------------------------------------- // Constructor // ------------------------------------------------------------------- @@ -287,12 +289,15 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession, thePropNames[ theIndex ].nspace = NULL; thePropNames[ theIndex ].name = NULL; - nError = ne_simple_propfind( inSession, - inPath, - inDepth, - thePropNames, - NPFR_propfind_results, - &ioResources ); + { + osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex ); + nError = ne_simple_propfind( inSession, + inPath, + inDepth, + thePropNames, + NPFR_propfind_results, + &ioResources ); + } for ( theIndex = 0; theIndex < thePropCount; theIndex ++ ) free( (void *)thePropNames[ theIndex ].name ); @@ -302,6 +307,7 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession, else { // ALLPROP + osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex ); nError = ne_simple_propfind( inSession, inPath, inDepth, |