--- mqtt/src/mqttd_calls.c	2012/04/26 07:25:00	1.2.2.5
+++ mqtt/src/mqttd_calls.c	2012/04/26 08:20:20	1.2.2.6
@@ -112,14 +112,13 @@ cmdCONNECT(void *srv, void *arg)
 {
 	struct tagStore *store;
 	struct tagSession *sess = (struct tagSession*) arg;
-	register int i;
 
 	ioTRACE(2);
 
 	if (!sess)
 		return -1;
 
-#if 0
+	ioDEBUG(5, "Exec CONNECT session");
 	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
 	SESS_UNLOCK;
@@ -128,17 +127,16 @@ cmdCONNECT(void *srv, void *arg)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
 	SESS_ELEM_LOCK(sess);
-	for (i = 0; i < MQTT_QOS_RESERVED; i++)
-		while ((store = SLIST_FIRST(&sess->sess_txque[i]))) {
-			SLIST_REMOVE_HEAD(&sess->sess_txque[i], st_node);
+	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
+		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
-			if (store->st_subscr.sub_topic.msg_base)
-				free(store->st_subscr.sub_topic.msg_base);
-			if (store->st_subscr.sub_value.msg_base)
-				free(store->st_subscr.sub_value.msg_base);
+		if (store->st_subscr.sub_topic.msg_base)
+			free(store->st_subscr.sub_topic.msg_base);
+		if (store->st_subscr.sub_value.msg_base)
+			free(store->st_subscr.sub_value.msg_base);
 
-			free(store);
-		}
+		free(store);
+	}
 	SESS_ELEM_UNLOCK(sess);
 
 	if (sess->sess_will.msg)
@@ -148,7 +146,6 @@ cmdCONNECT(void *srv, void *arg)
 
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
-#endif
 	return 0;
 }