--- mqtt/src/daemon.c	2012/07/03 07:48:49	1.2.2.44
+++ mqtt/src/daemon.c	2012/07/03 08:39:39	1.2.2.47
@@ -77,8 +77,8 @@ finiSession(struct tagSession *sess)
 			call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 		if (call.DeletePUB_subscribe)
 			call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
-		if (call.WipePUB_topic)
-			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
+		if (call.WipePUB_topic)	/* only dynamic messages */
+			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, 0);
 	}
 
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
@@ -222,6 +222,7 @@ startSession(sched_task_t *task)
 	int ret, wlen;
 	mqtt_subscr_t *subs;
 	struct timespec ts = { RETAIN_TIMEOUT, 0 };
+	intptr_t sock;
 
 	ioTRACE(4);
 
@@ -285,7 +286,8 @@ startSession(sched_task_t *task)
 		TAILQ_FOREACH(s, &Sessions, sess_node)
 			if (!strcmp(s->sess_cid, sess->sess_cid)) {
 				/* found stale session & disconnect it! */
-				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) s->sess_sock, NULL);
+				sock = s->sess_sock;
+				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) sock, NULL);
 				schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
 				break;
 			}
@@ -305,7 +307,7 @@ startSession(sched_task_t *task)
 	if (sess->sess_clean) {
 		if (call.DeletePUB_subscribe)
 			call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
-		if (call.WipePUB_topic)
+		if (call.WipePUB_topic)	/* delete ALL messages */
 			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
 	} else if (call.ReadPUB_subscribe) {
 		/* load subscribes */
@@ -404,6 +406,8 @@ Run(int sock)
 
 	schedPolling(root, &pl, NULL);
 	schedRun(root, &Kill);
+
+	schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
 
 	/* free all undeleted elements into lists */
 	TAILQ_FOREACH(sess, &Sessions, sess_node) {