From ed9ade05ea296ca853b888dea2b98a1005a760e1 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 30 Oct 2015 09:58:14 +0000
Subject: [PATCH] Improve merge asserts

---
 nameserver/entry.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nameserver/entry.go b/nameserver/entry.go
index 3b45fd0a..dd11f5b5 100644
--- a/nameserver/entry.go
+++ b/nameserver/entry.go
@@ -145,6 +145,7 @@ func (es *Entries) add(hostname, containerid string, origin router.PeerName, add
 
 func (es *Entries) merge(incoming Entries) Entries {
 	defer es.checkAndPanic().checkAndPanic()
+	incoming.checkAndPanic()
 
 	newEntries := Entries{}
 	i := 0
@@ -233,8 +234,6 @@ type GossipData struct {
 }
 
 func (g *GossipData) Merge(o router.GossipData) {
-	checkAndPanic(CaseInsensitive(g.Entries))
-	defer func() { checkAndPanic(CaseInsensitive(g.Entries)) }()
 	other := o.(*GossipData)
 	g.Entries.merge(other.Entries)
 	if g.Timestamp < other.Timestamp {