X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2Forg%2Flttng%2Fust%2Fagent%2Fclient%2FLttngTcpSessiondClient.java;h=0f979a4f88da7d7fa97da19c6786f0dcc9fe1e90;hp=c035e5e2e31043d4899ba2dc1bf1ee940ad249e7;hb=32974710aab75d01a8ae48d0be3641c2f56e45a9;hpb=cf22367fec17f2b2650e637de84fc2f614e4d2ac

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java
index c035e5e2..0f979a4f 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java
@@ -364,10 +364,17 @@ public class LttngTcpSessiondClient implements Runnable {
 	 */
 	private SessiondCommandHeader recvHeader() throws IOException {
 		byte data[] = new byte[SessiondCommandHeader.HEADER_SIZE];
+		int bytesLeft = data.length;
+		int bytesOffset = 0;
 
-		int readLen = this.inFromSessiond.read(data, 0, data.length);
-		if (readLen != data.length) {
-			throw new IOException();
+		while (bytesLeft != 0) {
+			int bytesRead = this.inFromSessiond.read(data, bytesOffset, bytesLeft);
+
+			if (bytesRead < 0) {
+				throw new IOException();
+			}
+			bytesLeft -= bytesRead;
+			bytesOffset += bytesRead;
 		}
 		return new SessiondCommandHeader(data);
 	}
@@ -381,15 +388,22 @@ public class LttngTcpSessiondClient implements Runnable {
 	 */
 	private byte[] recvPayload(SessiondCommandHeader headerCmd) throws IOException {
 		byte payload[] = new byte[(int) headerCmd.getDataSize()];
+		int bytesLeft = payload.length;
+		int bytesOffset = 0;
 
 		/* Failsafe check so we don't waste our time reading 0 bytes. */
-		if (payload.length == 0) {
+		if (bytesLeft == 0) {
 			return null;
 		}
 
-		int read = inFromSessiond.read(payload, 0, payload.length);
-		if (read != payload.length) {
-			throw new IOException("Unexpected number of bytes read in sessiond command payload");
+		while (bytesLeft != 0) {
+			int bytesRead = inFromSessiond.read(payload, bytesOffset, bytesLeft);
+
+			if (bytesRead < 0) {
+				throw new IOException();
+			}
+			bytesLeft -= bytesRead;
+			bytesOffset += bytesRead;
 		}
 		return payload;
 	}