From 21072a665f6d1b17c89f7df02541d2328dde9a65 Mon Sep 17 00:00:00 2001
From: Michael Baird <mbaird@umbel.com>
Date: Thu, 30 Nov 2017 22:03:24 -0600
Subject: [PATCH] refactor same node URI check in SendSync

---
 server.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/server.go b/server.go
index 67a9136c6..b3e42a4c8 100644
--- a/server.go
+++ b/server.go
@@ -345,13 +345,15 @@ func (s *Server) SendSync(pb proto.Message) error {
 			return err
 		}
 
-		// Don't forward the message to ourselves
-		if *s.URI != *uri {
-			ctx := context.WithValue(context.Background(), "uri", uri)
-			eg.Go(func() error {
-				return s.defaultClient.ClusterMessage(ctx, pb)
-			})
+		// Don't forward the message to ourselves.
+		if *s.URI == *uri {
+			continue
 		}
+
+		ctx := context.WithValue(context.Background(), "uri", uri)
+		eg.Go(func() error {
+			return s.defaultClient.ClusterMessage(ctx, pb)
+		})
 	}
 
 	return eg.Wait()