Removed double-fetch-room in the indexer.

I don't want to celebrate prematurely, but we've gotten through 10,000 ops
in every of 10 threads without deadlocking.

diff --git a/citadel/server/modules/fulltext/serv_fulltext.c b/citadel/server/modules/fulltext/serv_fulltext.c
index 6909e9f4770ea9f20a76d22357ebf5c5a019172c..216097174f5c91fa3128db10880629e9fb07356f 100644 (file)
--- a/citadel/server/modules/fulltext/serv_fulltext.c
+++ b/citadel/server/modules/fulltext/serv_fulltext.c
@@ -126,13 +126,11 @@ void ft_index_room(struct ctdlroom *qrbuf, void *data) {
        if (server_shutting_down) {
                return;
        }
-       CtdlGetRoom(&CC->room, qrbuf->QRname);
 
-#if 0
        int num_msgs = 0;
        long *msglist;
        int i;
-       num_msgs = CtdlFetchMsgList(CC->room.QRnumber, &msglist);
+       num_msgs = CtdlFetchMsgList(qrbuf->QRnumber, &msglist);
        if (msglist != NULL) {
                for (i=0; i<num_msgs; ++i) {
                        if (
@@ -145,7 +143,6 @@ void ft_index_room(struct ctdlroom *qrbuf, void *data) {
                }
                free(msglist);
        }
-#endif
 }