From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 29 Oct 2001 22:16:38 +0000 (+0000)
Subject: Server unlocks both "cmt" and "org" lock in zebra_server_unlock.
X-Git-Tag: ZEBRA.1.1.stable~9
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=bb96b42dc69e6dfa37ee277333e6de0df85fb070;p=idzebra-moved-to-github.git

Server unlocks both "cmt" and "org" lock in zebra_server_unlock.
---

diff --git a/index/locksrv.c b/index/locksrv.c
index 176aba5..e19bc42 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: locksrv.c,v $
- * Revision 1.15  2000-12-01 17:59:08  adam
+ * Revision 1.16  2001-10-29 22:16:38  adam
+ * Server unlocks both "cmt" and "org" lock in zebra_server_unlock.
+ *
+ * Revision 1.15  2000/12/01 17:59:08  adam
  * Fixed bug regarding online updates on WIN32.
  * When zebra.cfg is not available the server will not abort.
  *
@@ -135,16 +138,10 @@ void zebra_server_unlock (ZebraService zi, int commitPhase)
 {
     if (zi->server_lock_org == NULL)
         return;
-    if (commitPhase)
-    {
-        logf (LOG_DEBUG, "Server unlocks org");
-        zebra_unlock (zi->server_lock_org);
-    }
-    else
-    {
-        logf (LOG_DEBUG, "Server unlocks cmt");
-        zebra_unlock (zi->server_lock_cmt);
-    }
+    logf (LOG_DEBUG, "Server unlocks org");
+    zebra_unlock (zi->server_lock_org);
+    logf (LOG_DEBUG, "Server unlocks cmt");
+    zebra_unlock (zi->server_lock_cmt);
 }
 
 int zebra_server_lock_get_state (ZebraService zi, time_t *timep)