Merge pull request #265 from flycash/bug/reverseRegistryProtocol

Fix: Revert the registryProtocol.GetProtocol() to its original codes
apache · Nov 26, 2019 · d77b772 · d77b772
2 parents 6a691cd + 6d939d6
commit d77b772
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go
@@ -338,10 +338,10 @@ func setProviderUrl(regURL *common.URL, providerURL *common.URL) {
 }
 
 func GetProtocol() protocol.Protocol {
-	if regProtocol == nil {
-		regProtocol = newRegistryProtocol()
+	if regProtocol != nil {
+		return regProtocol
 	}
-	return regProtocol
+	return newRegistryProtocol()
 }
 
 type wrappedInvoker struct {

diff --git a/registry/protocol/protocol_test.go b/registry/protocol/protocol_test.go
@@ -291,8 +291,3 @@ func TestExportWithApplicationConfig(t *testing.T) {
 	v2, _ := regProtocol.bounds.Load(getCacheKey(newUrl))
 	assert.NotNil(t, v2)
 }
-
-func TestGetProtocol(t *testing.T) {
-	singleton := GetProtocol()
-	assert.True(t, singleton == GetProtocol())
-}