remove unused code

registry/zookeeper/listener.go

@@ -39,7 +39,6 @@ import (
 type RegistryDataListener struct {
 	subscribed map[string]config_center.ConfigurationListener
 	mutex      sync.Mutex
-	closed     bool
 }
 
 // NewRegistryDataListener constructs a new RegistryDataListener
@@ -50,17 +49,11 @@ func NewRegistryDataListener() *RegistryDataListener {
 
 // SubscribeURL is used to set a watch listener for url
 func (l *RegistryDataListener) SubscribeURL(url *common.URL, listener config_center.ConfigurationListener) {
-	if l.closed {
-		return
-	}
 	l.subscribed[url.ServiceKey()] = listener
 }
 
 // UnSubscribeURL is used to set a watch listener for url
 func (l *RegistryDataListener) UnSubscribeURL(url *common.URL) config_center.ConfigurationListener {
-	if l.closed {
-		return nil
-	}
 	listener := l.subscribed[url.ServiceKey()]
 	delete(l.subscribed, url.ServiceKey())
 	return listener
@@ -82,9 +75,6 @@ func (l *RegistryDataListener) DataChange(eventType remoting.Event) bool {
 	}
 	l.mutex.Lock()
 	defer l.mutex.Unlock()
-	if l.closed {
-		return false
-	}
 	for serviceKey, listener := range l.subscribed {
 		if serviceURL.ServiceKey() == serviceKey {
 			listener.Process(

registry/zookeeper/registry.go

@@ -290,20 +290,17 @@ func (r *zkRegistry) getCloseListener(conf *common.URL) (*RegistryConfigurationL
 
 	var zkListener *RegistryConfigurationListener
 	r.dataListener.mutex.Lock()
+	defer r.dataListener.mutex.Unlock()
 	configurationListener := r.dataListener.subscribed[conf.ServiceKey()]
 	if configurationListener != nil {
-
 		zkListener, _ := configurationListener.(*RegistryConfigurationListener)
 		if zkListener != nil {
 			if zkListener.isClosed {
 				return nil, perrors.New("configListener already been closed")
 			}
 		}
 	}
-
 	zkListener = r.dataListener.UnSubscribeURL(conf).(*RegistryConfigurationListener)
-	r.dataListener.mutex.Unlock()
-
 	if r.listener == nil {
 		return nil, perrors.New("listener is null can not close.")
 	}