From cc8b2cf6d529062399e0d9b4cde17f2475ef19c1 Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Tue, 5 Dec 2017 14:57:56 +0100
Subject: [PATCH] Only update Server URL when it's necessary.

---
 main.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index ee0def8..0908140 100644
--- a/main.go
+++ b/main.go
@@ -360,8 +360,10 @@ func XdsConnInit(ctx *cli.Context) error {
 		return cli.NewExitError("ERROR while getting XDS config: "+err.Error(), 1)
 	}
 	svrCfg := xdsConf.Servers[XdsServerIndexGet()]
-	if serverURL != "" && (svrCfg.URL != serverURL || !svrCfg.Connected) {
-		svrCfg.URL = serverURL
+	if (serverURL != "" && svrCfg.URL != serverURL) || !svrCfg.Connected {
+		if serverURL != "" {
+			svrCfg.URL = serverURL
+		}
 		svrCfg.ConnRetry = 10
 		if err := XdsConfigSet(xdsConf); err != nil {
 			return cli.NewExitError("ERROR while updating XDS server URL: "+err.Error(), 1)
-- 
2.16.6