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=793a5f8e0b42cc12038117528376c96caa0134ff;hb=c6a5845760ee02e99e5d0609f47706036e257d7f;hp=84ad973f3cea5f0cdc56194eac4604fbb0dc2141;hpb=fb30ba0004613d08357def6cdc3122083dd0019e;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 84ad973f..793a5f8e 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
@@ -158,23 +158,27 @@ public class LttngTcpSessiondClient implements Runnable {
 	}
 
 	private void connectToSessiond() throws IOException {
-		int port;
+		int rootPort = getPortFromFile(ROOT_PORT_FILE);
+		int userPort = getPortFromFile(getHomePath() + USER_PORT_FILE);
 
-		if (this.isRoot) {
-			port = getPortFromFile(ROOT_PORT_FILE);
-			if (port == 0) {
-				/* No session daemon available. Stop and retry later. */
-				throw new IOException();
-			}
-		} else {
-			port = getPortFromFile(getHomePath() + USER_PORT_FILE);
-			if (port == 0) {
-				/* No session daemon available. Stop and retry later. */
-				throw new IOException();
-			}
+		/*
+		 * Check for the edge case of both files existing but pointing to the
+		 * same port. In this case, let the root client handle it.
+		 */
+		if ((rootPort != 0) && (rootPort == userPort) && (!isRoot)) {
+			log("User and root config files both point to port " + rootPort +
+					". Letting the root client handle it.");
+			throw new IOException();
+		}
+
+		int portToUse = (isRoot ? rootPort : userPort);
+
+		if (portToUse == 0) {
+			/* No session daemon available. Stop and retry later. */
+			throw new IOException();
 		}
 
-		this.sessiondSock = new Socket(SESSION_HOST, port);
+		this.sessiondSock = new Socket(SESSION_HOST, portToUse);
 		this.inFromSessiond = new DataInputStream(sessiondSock.getInputStream());
 		this.outToSessiond = new DataOutputStream(sessiondSock.getOutputStream());
 	}