X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2Forg%2Flttng%2Fust%2Fagent%2Fclient%2FLttngTcpSessiondClient.java;h=c63850050444ad42a47a8dccce94b3b30f2b638e;hb=dcd9a9d798f85ccee281d66f85ff4a9b5520a088;hp=d42bc9af4ee112c105ee48605b58c1c98843ba09;hpb=0b7be275cc204aecb1f21884e33d7a1e4fa9023b;p=lttng-ust.git

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 d42bc9af..c6385005 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
@@ -133,11 +133,31 @@ public class LttngTcpSessiondClient implements Runnable {
 				handleSessiondCmd();
 			} catch (UnknownHostException uhe) {
 				uhe.printStackTrace();
+				/*
+				 * Terminate agent thread.
+				 */
+				close();
 			} catch (IOException ioe) {
+				/*
+				 * I/O exception may have been triggered by a session daemon
+				 * closing the socket. Close our own socket and
+				 * retry connecting after a delay.
+				 */
 				try {
+					if (this.sessiondSock != null) {
+						this.sessiondSock.close();
+					}
 					Thread.sleep(3000);
 				} catch (InterruptedException e) {
-					e.printStackTrace();
+					/*
+					 * Retry immediately if sleep is interrupted.
+					 */
+				} catch (IOException closeioe) {
+					closeioe.printStackTrace();
+					/*
+					 * Terminate agent thread.
+					 */
+					close();
 				}
 			}
 		}
@@ -367,7 +387,7 @@ public class LttngTcpSessiondClient implements Runnable {
 		int bytesLeft = data.length;
 		int bytesOffset = 0;
 
-		while (bytesLeft >= 0) {
+		while (bytesLeft > 0) {
 			int bytesRead = this.inFromSessiond.read(data, bytesOffset, bytesLeft);
 
 			if (bytesRead < 0) {
@@ -396,7 +416,7 @@ public class LttngTcpSessiondClient implements Runnable {
 			return null;
 		}
 
-		while (bytesLeft >= 0) {
+		while (bytesLeft > 0) {
 			int bytesRead = inFromSessiond.read(payload, bytesOffset, bytesLeft);
 
 			if (bytesRead < 0) {