From 38ca186a8fc72a16d92292ba96a5a858c0281abd Mon Sep 17 00:00:00 2001
From: Patrick <dreamlike.sky@foxmail.com>
Date: Thu, 2 Apr 2020 23:42:32 +0800
Subject: [PATCH] optimize some code and fix imports

---
 common/observer/dispatcher/direct_event_dispatcher.go      | 2 ++
 common/observer/dispatcher/direct_event_dispatcher_test.go | 5 ++++-
 common/observer/event_dispatcher.go                        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/observer/dispatcher/direct_event_dispatcher.go b/common/observer/dispatcher/direct_event_dispatcher.go
index 412585b79..b539ef92d 100644
--- a/common/observer/dispatcher/direct_event_dispatcher.go
+++ b/common/observer/dispatcher/direct_event_dispatcher.go
@@ -38,10 +38,12 @@ type DirectEventDispatcher struct {
 	observer.BaseListenable
 }
 
+// NewDirectEventDispatcher ac constructor of DirectEventDispatcher
 func NewDirectEventDispatcher() observer.EventDispatcher {
 	return &DirectEventDispatcher{}
 }
 
+// Dispatch event directly
 func (ded *DirectEventDispatcher) Dispatch(event observer.Event) {
 	if event == nil {
 		logger.Warnf("[DirectEventDispatcher] dispatch event nil")
diff --git a/common/observer/dispatcher/direct_event_dispatcher_test.go b/common/observer/dispatcher/direct_event_dispatcher_test.go
index 557dd1522..355c930a9 100644
--- a/common/observer/dispatcher/direct_event_dispatcher_test.go
+++ b/common/observer/dispatcher/direct_event_dispatcher_test.go
@@ -19,11 +19,14 @@ package dispatcher
 
 import (
 	"fmt"
-	"github.com/apache/dubbo-go/common/observer"
 	"reflect"
 	"testing"
 )
 
+import (
+	"github.com/apache/dubbo-go/common/observer"
+)
+
 func TestDirectEventDispatcher_Dispatch(t *testing.T) {
 	ded := NewDirectEventDispatcher()
 	ded.AddEventListener(&TestEventListener{})
diff --git a/common/observer/event_dispatcher.go b/common/observer/event_dispatcher.go
index 8b3950480..851381804 100644
--- a/common/observer/event_dispatcher.go
+++ b/common/observer/event_dispatcher.go
@@ -51,7 +51,7 @@ func SetAndInitGlobalDispatcher(name string) {
 	if globalEventDispatcher != nil {
 		logger.Warnf("EventDispatcher already init. It will be replaced")
 	}
-	if dispatchers[name] == nil {
+	if dp, ok := dispatchers[name]; !ok || dp == nil {
 		panic("EventDispatcher for " + name + " is not existing, make sure you have import the package.")
 	}
 	globalEventDispatcher = dispatchers[name]()
-- 
GitLab