narayana/go-xmpp
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: narayana:commands-fix
Branches Tags
narayana:160-regression
narayana:process-one-is-lazy
narayana:commands-fix
narayana:disco_info_form
...
pull from: narayana:160-regression
Branches Tags
narayana:process-one-is-lazy
narayana:commands-fix
narayana:disco_info_form
narayana:160-regression

1 commit
commands-f ... 160-regres

Author SHA1 Message Date
Bohdan Horbeshko e55463fc98 Fix passing Component to StreamManager 
0a4acd12c3, which fixes #160, introduced
a regression as it assumed only Client may implement StreamClient, and
passing a component triggers an unconditional "client is not
disconnected" error.
 2021-12-18 10:55:35 -05:00
1 changed files with 16 additions and 11 deletions
Show stats Expand all files Collapse all files

13
stream_manager.go
View file

@ -114,10 +114,16 @@ func (sm *StreamManager) Stop() {
func (sm *StreamManager) connect() error { func (sm *StreamManager) connect() error {
if sm.client != nil { if sm.client != nil {
if c, ok := sm.client.(*Client); ok { var scs *SyncConnState
if c.CurrentState.getState() == StateDisconnected { if client, ok := sm.client.(*Client); ok {
scs = &client.CurrentState
}
if component, ok := sm.client.(*Component); ok {
scs = &component.CurrentState
}
if scs != nil && scs.getState() == StateDisconnected {
sm.Metrics = initMetrics() sm.Metrics = initMetrics()
err := c.Connect() err := sm.client.Connect()
if err != nil { if err != nil {
return err return err
} }
@ -127,7 +133,6 @@ func (sm *StreamManager) connect() error {
return nil return nil
} }
} }
}
return errors.New("client is not disconnected") return errors.New("client is not disconnected")
} }