[PATCH] Actually close the xapian database in notmuch_database_close

diff --git a/2e/a0ae91e5ddd2efef244f75953f0553f7752558 b/2e/a0ae91e5ddd2efef244f75953f0553f7752558
new file mode 100644 (file)
index 0000000..bc5f6bd
--- /dev/null
+++ b/2e/a0ae91e5ddd2efef244f75953f0553f7752558
@@ -0,0 +1,89 @@
+Return-Path: <teythoon@jade-hamburg.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 72F21431FD5\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 01:19:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id cW1vGOvghw4T for <notmuch@notmuchmail.org>;\r
+       Wed, 29 Feb 2012 01:19:28 -0800 (PST)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E01F1431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 01:19:27 -0800 (PST)\r
+Received: from mail.jade-hamburg.de (unknown [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id 225494F2EC9\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:19:26 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 64B9BDF2A8; Wed, 29 Feb 2012 10:19:25 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id 689DEDF2A3;\r
+       Wed, 29 Feb 2012 10:19:23 +0100 (CET)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1S2fgw-00068R-Kq; Wed, 29 Feb 2012 10:19:22 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Actually close the xapian database in notmuch_database_close\r
+Date: Wed, 29 Feb 2012 10:19:17 +0100\r
+Message-Id:\r
+ <1330507157-22859-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9\r
+In-Reply-To:\r
+ <1330507157-22859-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1330507157-22859-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 29 Feb 2012 09:19:29 -0000\r
+\r
+Formerly the xapian database object was deleted and closed in its\r
+destructor once the object was garbage collected. Explicitly call\r
+close() so that the database and the associated lock is released\r
+immediately.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ lib/database.cc |    4 ++++\r
+ 1 files changed, 4 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 5efa85e..79cf375 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -726,6 +726,10 @@ notmuch_database_close (notmuch_database_t *notmuch)\r
+       }\r
+     }\r
+ \r
++    if (notmuch->xapian_db != NULL) {\r
++      notmuch->xapian_db->close();\r
++    }\r
++\r
+     delete notmuch->term_gen;\r
+     delete notmuch->query_parser;\r
+     delete notmuch->xapian_db;\r
+-- \r
+1.7.9\r
+\r