--- mqtt/src/daemon.c	2012/05/05 14:51:02	1.2.2.25
+++ mqtt/src/daemon.c	2012/05/05 15:04:29	1.2.2.26
@@ -140,10 +140,12 @@ dispatchSession(sched_task_t *task)
 	/* receive & decode packet */
 	if ((ret = recv(TASK_FD(task), sess->sess_buf->msg_base, sess->sess_buf->msg_len, 0)) == -1) {
 		ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
 		finiSession(sess);
 		return NULL;
 	} else if (!ret) {
 		ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
 		finiSession(sess);
 		return NULL;
 	}
@@ -153,6 +155,7 @@ dispatchSession(sched_task_t *task)
 		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
 			if (len == -1)
 				ioLIBERR(mqtt);
+			TAILQ_REMOVE(&Sessions, sess, sess_node);
 			finiSession(sess);
 		} else
 			ret -= len;
@@ -160,6 +163,7 @@ dispatchSession(sched_task_t *task)
 
 	if (len >= 0 && !schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 0)) {
 		ioLIBERR(sched);
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
 		finiSession(sess);
 	}
 	return NULL;
@@ -251,12 +255,11 @@ startSession(sched_task_t *task)
 	}
 
 	/* Start session task OK ... */
-	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
-
 	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {
 		ioLIBERR(sched);
 		ret = MQTT_RETCODE_DENIED;
-	}
+	} else
+		TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
 
 	call.LOG(logg, "Session %s started from %s for user %s (timeout=%d) OK!\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user, sess->sess_ka);
@@ -352,6 +355,7 @@ Run(int sock)
 	}
 	TAILQ_FOREACH(sess, &Sessions, sess_node) {
 		TAILQ_REMOVE(&Sessions, sess, sess_node);
+
 		finiSession(sess);
 	}
 	return 0;