From dc338305926c9c34d1cdfbf0d8cd329da7e6b37c Mon Sep 17 00:00:00 2001
From: Eugene K <eugene.kobyakov@netfoundry.io>
Date: Tue, 12 Jan 2021 09:11:01 -0500
Subject: [PATCH] avoid setting empty PublicKeyHeader

---
 router/xgress_edge/dialer.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/router/xgress_edge/dialer.go b/router/xgress_edge/dialer.go
index b039a9c4d..c9d983ba3 100644
--- a/router/xgress_edge/dialer.go
+++ b/router/xgress_edge/dialer.go
@@ -88,7 +88,9 @@ func (dialer *dialer) Dial(destination string, sessionId *identity.TokenId, addr
 
 	log.Debug("dialing sdk client hosting service")
 	dialRequest := edge.NewDialMsg(listenConn.Id(), token, callerId)
-	dialRequest.Headers[edge.PublicKeyHeader] = sessionId.Data[edge.PublicKeyHeader]
+	if pk, ok := sessionId.Data[edge.PublicKeyHeader]; ok {
+		dialRequest.Headers[edge.PublicKeyHeader] = pk
+	}
 	appData, hasAppData := sessionId.Data[edge.AppDataHeader]
 	if hasAppData {
 		dialRequest.Headers[edge.AppDataHeader] = appData