Merge "Fix for DB read after VM restart and REST subscription query aded"

[ric-plt/submgr.git] / pkg / control / restendpoint.go

diff --git a/pkg/control/restendpoint.go b/pkg/control/restendpoint.go
index 96df505..2e64f05 100644 (file)
--- a/pkg/control/restendpoint.go
+++ b/pkg/control/restendpoint.go
@@ -31,6 +31,7 @@ import (
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
+
 func ConstructEndpointAddresses(clientEndpoint models.SubscriptionParamsClientEndpoint) (string, string, error) {
 
        var HTTP_port int64 = *clientEndpoint.HTTPPort
@@ -39,8 +40,13 @@ func ConstructEndpointAddresses(clientEndpoint models.SubscriptionParamsClientEn
        var xAppHTTPEndPoint string
        var xAppRMREndPoint string
 
-       if host == "" || (HTTP_port == 0 && RMR_port == 0) {
-               err := fmt.Errorf("ClientEndpoint aprovided no PORT numbers")
+       if host == "" {
+               err := fmt.Errorf("ClientEndpoint provided without HOST name")
+               return "", "", err
+       }
+
+       if HTTP_port == 0 && RMR_port == 0 {
+               err := fmt.Errorf("ClientEndpoint provided without PORT numbers")
                return "INVALID_HTTP_ADDRESS:" + host + (string)(*clientEndpoint.HTTPPort),
                        "INVALID_RMR_ADDRESS:" + host + (string)(*clientEndpoint.RMRPort),
                        err