Merge remote-tracking branch 'upstream/develop' into develop

registry/factory.go

-package registry
-
-import "github.com/dubbo/go-for-apache-dubbo/config"
-
-type RegistryFactory interface {
-	GetRegistry(url config.URL) Registry
-}

registry/registry.go

@@ -14,13 +14,6 @@ type Registry interface {
 
 	//used for service consumer ,start subscribe service event from registry
 	Subscribe(config.URL) (Listener, error)
-
-	//input the serviceConfig , registry should return serviceUrlArray with multi location(provider nodes) available
-	//GetService(SubURL) ([]SubURL, error)
-	//close the registry for Elegant closing
-	//Close()
-	//return if the registry is closed for consumer subscribing
-	//IsClosed() bool
 }
 
 type Listener interface {

registry/zookeeper/zk_client.go

@@ -294,8 +294,8 @@ func (z *zookeeperClient) RegisterTemp(basePath string, node string) (string, er
 		tmpPath, err = z.conn.Create(zkPath, data, zk.FlagEphemeral, zk.WorldACL(zk.PermAll))
 	}
 	z.Unlock()
-	//if err != nil && err != zk.ErrNodeExists {
-	if err != nil {
+	if err != nil && err != zk.ErrNodeExists {
+		//if err != nil {
 		log.Warn("conn.Create(\"%s\", zk.FlagEphemeral) = error(%v)\n", zkPath, jerrors.ErrorStack(err))
 		return "", jerrors.Trace(err)
 	}