connmgr: more fixups..

Change-Id: I892bcfac5e8f22e0579573822f717412fd16886f

src/connmgr.c

@@ -125,6 +125,7 @@ static void invoke_request(connmgr_request *req)
         connmgr_cinfo *info = (connmgr_cinfo *)req->conn->poolinfo;
         lcb_assert(info->state == CS_IDLE);
         info->state = CS_LEASED;
+        req->state = RS_ASSIGNED;
         lcb_timer_disarm(info->idle_timer);
     }
 
@@ -249,7 +250,7 @@ static void async_invoke_request(lcb_timer_t tm, lcb_t instance, const void *coo
 void connmgr_get(connmgr_t *pool, connmgr_request *req, lcb_uint32_t timeout)
 {
     connmgr_hostent *he;
-    lcb_list_t *cur, *next;
+    lcb_list_t *cur;
 
     if (req->state != RS_UNINIT) {
         lcb_log(LOGARGS(pool, INFO),
@@ -276,27 +277,21 @@ void connmgr_get(connmgr_t *pool, connmgr_request *req, lcb_uint32_t timeout)
         genhash_store(pool->ht, he->key, strlen(he->key), he, 0);
     }
 
-
-    req->conn = NULL;
     req->he = he;
+    cur = lcb_clist_pop(&he->ll_idle);
 
-    LCB_LIST_SAFE_FOR(cur, next, (lcb_list_t *)&he->ll_idle) {
+    if (cur) {
         connmgr_cinfo *info = LCB_LIST_ITEM(cur, connmgr_cinfo, llnode);
+        lcb_error_t err;
 
-        lcb_clist_delete(&he->ll_idle, &info->llnode);
         lcb_timer_disarm(info->idle_timer);
 
         req->conn = &info->connection;
-        info->state = CS_LEASED;
-        he->n_leased++;
-        break;
-    }
-
-    if (req->conn) {
-        lcb_error_t err;
         req->state = RS_ASSIGNED;
         req->timer = lcb_async_create(pool->io, req, async_invoke_request, &err);
-        lcb_log(LOGARGS(pool, INFO), "Pairing connection with request..");
+
+        info->state = CS_LEASED;
+        he->n_leased++;
 
     } else {
         req->state = RS_PENDING;