From 5ff9581b104a24f3b99dfa18704ada932af74a01 Mon Sep 17 00:00:00 2001
From: Diego Alvarez <diego.alvarez@shopify.com>
Date: Thu, 14 May 2020 16:14:48 -0700
Subject: [PATCH] more go like code, returning earlier

---
 broker.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/broker.go b/broker.go
index e8bb2ed10..232559aea 100644
--- a/broker.go
+++ b/broker.go
@@ -1427,14 +1427,15 @@ func validServerNameTLS(addr string, cfg *tls.Config) *tls.Config {
 	if cfg == nil {
 		cfg = &tls.Config{}
 	}
-	if cfg.ServerName == "" {
-		c := cfg.Clone()
-		sn, _, err := net.SplitHostPort(addr)
-		if err != nil {
-			Logger.Println(fmt.Errorf("failed to get ServerName from addr %w", err))
-		}
-		c.ServerName = sn
-		cfg = c
+	if cfg.ServerName != "" {
+		return cfg
+	}
+
+	c := cfg.Clone()
+	sn, _, err := net.SplitHostPort(addr)
+	if err != nil {
+		Logger.Println(fmt.Errorf("failed to get ServerName from addr %w", err))
 	}
-	return cfg
+	c.ServerName = sn
+	return c
 }