--- mqtt/src/mqttd_calls.c	2012/05/05 13:39:27	1.2.2.9
+++ mqtt/src/mqttd_calls.c	2012/05/05 14:51:02	1.2.2.10
@@ -84,9 +84,7 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 			}
 
 			/* add to cache */
-			SESS_ELEM_LOCK(sess);
 			SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
-			SESS_ELEM_UNLOCK(sess);
 
 			subs[i].sub_ret = MQTT_QOS_PASS;
 		} else
@@ -163,14 +161,11 @@ cmdCONNECT(void *srv, int len, void *arg)
 		return -1;
 
 	ioDEBUG(5, "Exec CONNECT session");
-	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
 
 	if (call.FiniSessPUB)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
-	SESS_ELEM_LOCK(sess);
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
 		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
@@ -181,7 +176,6 @@ cmdCONNECT(void *srv, int len, void *arg)
 
 		free(store);
 	}
-	SESS_ELEM_UNLOCK(sess);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
@@ -206,13 +200,11 @@ cmdDISCONNECT(void *srv, int len, void *arg)
 		return -1;
 
 	ioDEBUG(5, "Exec DISCONNECT session");
-	SESS_LOCK;
+
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
 
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
 
-	finiSession(sess);
-	return 0;
+	return -2;	/* must terminate dispatcher */
 }