X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=b4f170bb1d759c2289148d2ce31e8006277110eb;hb=4c76dfa1f554725ebc143170087ed705f2858666;hp=aa0325570171c9f6f0807edc92c953ace241004d;hpb=95151b82610bd542d27b5372503f9afffaccd859;p=sysdb.git

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index aa03255..b4f170b 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -359,12 +359,6 @@ command_handle(sdb_conn_t *conn)
 		sdb_connection_send(conn, CONNECTION_ERROR,
 				(uint32_t)sdb_strbuf_len(conn->errbuf),
 				sdb_strbuf_string(conn->errbuf));
-
-	/* remove the command from the buffer */
-	if (conn->cmd_len)
-		sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
-	conn->cmd = CONNECTION_IDLE;
-	conn->cmd_len = 0;
 	return status;
 } /* command_handle */
 
@@ -468,9 +462,16 @@ sdb_connection_read(sdb_conn_t *conn)
 				&& (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
 			command_init(conn);
 		if ((conn->cmd != CONNECTION_IDLE)
-				&& (sdb_strbuf_len(conn->buf) >= conn->cmd_len))
+				&& (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) {
 			command_handle(conn);
 
+			/* remove the command from the buffer */
+			if (conn->cmd_len)
+				sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
+			conn->cmd = CONNECTION_IDLE;
+			conn->cmd_len = 0;
+		}
+
 		if (status <= 0)
 			break;