svn commit: r964474 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[ph...@apache.org]

Author: philip
Date: Thu Jul 15 15:51:25 2010
New Revision: 964474

URL: http://svn.apache.org/viewvc?rev=964474&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_temp_forget_directory): Don't unlock if SVN_WC__SINGLE_DB.
  (svn_wc__db_wclock_release): Use correct type for owned_locks.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=964474&r1=964473&r2=964474&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jul 15 15:51:25 2010
@@ -6976,6 +6976,7 @@ svn_wc__db_temp_forget_directory(svn_wc_
       if (!svn_dirent_is_ancestor(local_dir_abspath, pdh->local_abspath))
         continue;
 
+#ifndef SVN_WC__SINGLE_DB
       if (pdh->locked)
         {
           err = svn_wc__db_wclock_release(db, pdh->local_abspath,
@@ -6991,6 +6992,7 @@ svn_wc__db_temp_forget_directory(svn_wc_
         }
 
       SVN_ERR_ASSERT(!pdh->locked);
+#endif
 
       apr_hash_set(db->dir_data, key, klen, NULL);
 
@@ -7938,9 +7940,10 @@ svn_wc__db_wclock_release(svn_wc__db_t *
   owned_locks = pdh->wcroot->owned_locks;
   for (i = 0; i < owned_locks->nelts; i++)
     {
-      const char *lock_abspath = APR_ARRAY_IDX(owned_locks, i, const char*);
+      svn_wc__db_wclock_t lock = APR_ARRAY_IDX(owned_locks, i,
+                                               svn_wc__db_wclock_t);
 
-      if (strcmp(lock_abspath, local_abspath) == 0)
+      if (strcmp(lock.relpath, local_relpath) == 0)
         break;
     }