Merge remote-tracking branch 'origin/3.0' into 3.0
diff --git a/registry/polaris/registry.go b/registry/polaris/registry.go
index 39db13d..9f7f073 100644
--- a/registry/polaris/registry.go
+++ b/registry/polaris/registry.go
@@ -165,15 +165,7 @@
continue
}
- watcher := &PolarisServiceWatcher{
- subscribeParam: &newParam,
- consumer: newConsumer,
- lock: &sync.RWMutex{},
- subscribers: make([]subscriber, 0),
- execOnce: &sync.Once{},
- }
-
- watcher, err = newPolarisWatcher(&newParam, newConsumer)
+ watcher, err := newPolarisWatcher(&newParam, newConsumer)
if err != nil {
logger.Warnf("getwatcher() = err:%v", perrors.WithStack(err))
<-time.After(time.Duration(RegistryConnDelay) * time.Second)
