From f87d7f36f5abc70ef5f6d77d056a5171ae95ac55 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Fri, 14 Oct 2016 21:19:45 +0200 Subject: [PATCH] check nil settings --- proxy/registry/config_cache.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proxy/registry/config_cache.go b/proxy/registry/config_cache.go index 47868820c..fea5c992a 100644 --- a/proxy/registry/config_cache.go +++ b/proxy/registry/config_cache.go @@ -26,6 +26,9 @@ func MarshalInboundConfig(protocol string, settings *any.Any) (interface{}, erro if err != nil { return nil, err } + if settings == nil { + return config, nil + } if err := ptypes.UnmarshalAny(settings, config.(proto.Message)); err != nil { return nil, err } @@ -37,6 +40,9 @@ func MarshalOutboundConfig(protocol string, settings *any.Any) (interface{}, err if err != nil { return nil, err } + if settings == nil { + return config, nil + } if err := ptypes.UnmarshalAny(settings, config.(proto.Message)); err != nil { return nil, err }