From: Sebastien Douheret Date: Tue, 5 Dec 2017 13:57:56 +0000 (+0100) Subject: Only update Server URL when it's necessary. X-Git-Tag: v0.1.1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-cli.git;a=commitdiff_plain;h=cc8b2cf6d529062399e0d9b4cde17f2475ef19c1 Only update Server URL when it's necessary. --- 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)