--- mqtt/src/mqtt_pub.c	2012/04/11 15:08:27	1.2.2.2
+++ mqtt/src/mqtt_pub.c	2012/04/16 00:09:57	1.2.2.3
@@ -89,24 +89,26 @@ Publish(int sock)
 		goto end;
 	}
 
-	siz = mqtt_msgPUBREL(args->msg, args->MsgID);
-	if (siz == -1) {
-		printf("Error:: msgPUBREL #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
-		return -1;
-	}
-	if (SendTo(sock, siz) == -1)
-		return -1;
+	do {
+		siz = mqtt_msgPUBREL(args->msg, args->MsgID);
+		if (siz == -1) {
+			printf("Error:: msgPUBREL #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
+			return -1;
+		}
+		if (SendTo(sock, siz) == -1)
+			return -1;
 
-	if ((siz = RecvFrom(sock)) == -1 || !siz)
-		return -1;
+		if ((siz = RecvFrom(sock)) == -1 || !siz)
+			return -1;
 
-	siz = mqtt_readPUBCOMP(args->msg);
-	if (siz == args->MsgID)
-		return siz;
-	if (!args->Dup) {
-		args->Dup++;
-		return Publish(sock);
-	}
+		siz = mqtt_readPUBCOMP(args->msg);
+		if (siz == args->MsgID)
+			return siz;
+		if (!args->Dup) {
+			args->Dup++;
+			continue;
+		}
+	} while (0);
 
 end:
 	printf("Error:: Message not delivered\n");