@@ -820,7 +820,7 @@ func (aw *aggregatedWorker) Start() error {
820
820
return fmt .Errorf ("failed to get executable checksum: %v" , err )
821
821
}
822
822
823
- if ! isInterfaceNil ( aw .workflowWorker ) {
823
+ if aw .workflowWorker != nil {
824
824
if len (aw .registry .getRegisteredWorkflowTypes ()) == 0 {
825
825
aw .logger .Info (
826
826
"Worker has no workflows registered, so workflow worker will not be started." ,
@@ -832,23 +832,23 @@ func (aw *aggregatedWorker) Start() error {
832
832
}
833
833
aw .logger .Info ("Started Workflow Worker" )
834
834
}
835
- if ! isInterfaceNil ( aw .activityWorker ) {
835
+ if aw .activityWorker != nil {
836
836
if len (aw .registry .getRegisteredActivities ()) == 0 {
837
837
aw .logger .Info (
838
838
"Worker has no activities registered, so activity worker will not be started." ,
839
839
)
840
840
} else {
841
841
if err := aw .activityWorker .Start (); err != nil {
842
842
// stop workflow worker.
843
- if ! isInterfaceNil ( aw .workflowWorker ) {
843
+ if aw .workflowWorker != nil {
844
844
aw .workflowWorker .Stop ()
845
845
}
846
846
return err
847
847
}
848
- if ! isInterfaceNil ( aw .locallyDispatchedActivityWorker ) {
848
+ if aw .locallyDispatchedActivityWorker != nil {
849
849
if err := aw .locallyDispatchedActivityWorker .Start (); err != nil {
850
850
// stop workflow worker.
851
- if ! isInterfaceNil ( aw .workflowWorker ) {
851
+ if aw .workflowWorker != nil {
852
852
aw .workflowWorker .Stop ()
853
853
}
854
854
aw .activityWorker .Stop ()
@@ -859,35 +859,35 @@ func (aw *aggregatedWorker) Start() error {
859
859
}
860
860
}
861
861
862
- if ! isInterfaceNil ( aw .sessionWorker ) {
862
+ if aw .sessionWorker != nil {
863
863
if err := aw .sessionWorker .Start (); err != nil {
864
864
// stop workflow worker and activity worker.
865
- if ! isInterfaceNil ( aw .workflowWorker ) {
865
+ if aw .workflowWorker != nil {
866
866
aw .workflowWorker .Stop ()
867
867
}
868
- if ! isInterfaceNil ( aw .activityWorker ) {
868
+ if aw .activityWorker != nil {
869
869
aw .activityWorker .Stop ()
870
870
}
871
- if ! isInterfaceNil ( aw .locallyDispatchedActivityWorker ) {
871
+ if aw .locallyDispatchedActivityWorker != nil {
872
872
aw .locallyDispatchedActivityWorker .Stop ()
873
873
}
874
874
return err
875
875
}
876
876
aw .logger .Info ("Started Session Worker" )
877
877
}
878
878
879
- if ! isInterfaceNil ( aw .shadowWorker ) {
879
+ if aw .shadowWorker != nil {
880
880
if err := aw .shadowWorker .Start (); err != nil {
881
- if ! isInterfaceNil ( aw .workflowWorker ) {
881
+ if aw .workflowWorker != nil {
882
882
aw .workflowWorker .Stop ()
883
883
}
884
- if ! isInterfaceNil ( aw .activityWorker ) {
884
+ if aw .activityWorker != nil {
885
885
aw .activityWorker .Stop ()
886
886
}
887
- if ! isInterfaceNil ( aw .locallyDispatchedActivityWorker ) {
887
+ if aw .locallyDispatchedActivityWorker != nil {
888
888
aw .locallyDispatchedActivityWorker .Stop ()
889
889
}
890
- if ! isInterfaceNil ( aw .sessionWorker ) {
890
+ if aw .sessionWorker != nil {
891
891
aw .sessionWorker .Stop ()
892
892
}
893
893
return err
@@ -971,19 +971,19 @@ func (aw *aggregatedWorker) Run() error {
971
971
}
972
972
973
973
func (aw * aggregatedWorker ) Stop () {
974
- if ! isInterfaceNil ( aw .workflowWorker ) {
974
+ if aw .workflowWorker != nil {
975
975
aw .workflowWorker .Stop ()
976
976
}
977
- if ! isInterfaceNil ( aw .activityWorker ) {
977
+ if aw .activityWorker != nil {
978
978
aw .activityWorker .Stop ()
979
979
}
980
- if ! isInterfaceNil ( aw .locallyDispatchedActivityWorker ) {
980
+ if aw .locallyDispatchedActivityWorker != nil {
981
981
aw .locallyDispatchedActivityWorker .Stop ()
982
982
}
983
- if ! isInterfaceNil ( aw .sessionWorker ) {
983
+ if aw .sessionWorker != nil {
984
984
aw .sessionWorker .Stop ()
985
985
}
986
- if ! isInterfaceNil ( aw .shadowWorker ) {
986
+ if aw .shadowWorker != nil {
987
987
aw .shadowWorker .Stop ()
988
988
}
989
989
aw .logger .Info ("Stopped Worker" )
@@ -1231,10 +1231,6 @@ func getWorkflowFunctionName(r *registry, i interface{}) string {
1231
1231
return result
1232
1232
}
1233
1233
1234
- func isInterfaceNil (i interface {}) bool {
1235
- return i == nil || reflect .ValueOf (i ).IsNil ()
1236
- }
1237
-
1238
1234
func getReadOnlyChannel (c chan struct {}) <- chan struct {} {
1239
1235
return c
1240
1236
}
0 commit comments