#89617# - Fixed queryContent(...). Mutex Guard now constructed a little bit later.

3 files changed, 12 insertions, 12 deletions

diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index dc26ee4460e8..bd3e116c4270 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hierarchyprovider.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kso $ $Date: 2001-07-03 11:16:33 $
+ *  last change: $Author: kso $ $Date: 2001-07-12 15:04:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,8 +171,6 @@ HierarchyContentProvider::queryContent(
         const uno::Reference< star::ucb::XContentIdentifier >& Identifier )
     throw( star::ucb::IllegalIdentifierException, uno::RuntimeException )
 {
-    vos::OGuard aGuard( m_aMutex );
-
     HierarchyUri aUri( Identifier->getContentIdentifier() );
     if ( !aUri.isValid() )
         throw star::ucb::IllegalIdentifierException();
@@ -182,6 +180,8 @@ HierarchyContentProvider::queryContent(
         = new ::ucb::ContentIdentifier( m_xSMgr,
                                         HierarchyUri::encodeURL(
                                                             aUri.getUri() ) );
+    vos::OGuard aGuard( m_aMutex );
+
     // Check, if a content with given id already exists...
     uno::Reference< star::ucb::XContent > xContent
         = queryExistingContent( xCanonicId ).getBodyPtr();
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index e6054fddef15..62125bff5674 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pkgprovider.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kso $ $Date: 2001-07-06 08:11:17 $
+ *  last change: $Author: kso $ $Date: 2001-07-12 15:05:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -256,8 +256,6 @@ uno::Reference< star::ucb::XContent > SAL_CALL ContentProvider::queryContent(
             const uno::Reference< star::ucb::XContentIdentifier >& Identifier )
     throw( star::ucb::IllegalIdentifierException, uno::RuntimeException )
 {
-    vos::OGuard aGuard( m_aMutex );
-
     if ( !Identifier.is() )
         return uno::Reference< star::ucb::XContent >();
 
@@ -270,6 +268,8 @@ uno::Reference< star::ucb::XContent > SAL_CALL ContentProvider::queryContent(
     uno::Reference< star::ucb::XContentIdentifier > xId
                 = new ::ucb::ContentIdentifier( m_xSMgr, aUri.getUri() );
 
+    vos::OGuard aGuard( m_aMutex );
+
     // Check, if a content with given id already exists...
     uno::Reference< star::ucb::XContent > xContent
         = queryExistingContent( xId ).getBodyPtr();
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 24281605f386..abf6819091d9 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: webdavprovider.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kso $ $Date: 2001-06-25 08:51:54 $
+ *  last change: $Author: kso $ $Date: 2001-07-12 15:04:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -157,8 +157,6 @@ ContentProvider::queryContent(
     throw( com::sun::star::ucb::IllegalIdentifierException,
            uno::RuntimeException )
 {
-    vos::OGuard aGuard( m_aMutex );
-
     // Check URL scheme...
 
     const rtl::OUString aScheme
@@ -205,6 +203,8 @@ ContentProvider::queryContent(
     else
         xCanonicId = Identifier;
 
+    vos::OGuard aGuard( m_aMutex );
+
     // Check, if a content with given id already exists...
     uno::Reference< com::sun::star::ucb::XContent > xContent
         = queryExistingContent( xCanonicId ).getBodyPtr();