Merge "sbft: do not backlog view change and new view messages"

hyperledger · Nov 17, 2016 · 97f8584 · 97f8584
2 parents 4b96f32 + 644223e
commit 97f8584
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/orderer/sbft/simplebft/simplebft.go b/orderer/sbft/simplebft/simplebft.go
@@ -192,6 +192,12 @@ func (s *SBFT) Receive(m *Msg, src uint64) {
 	} else if req := m.GetRequest(); req != nil {
 		s.handleRequest(req, src)
 		return
+	} else if vs := m.GetViewChange(); vs != nil {
+		s.handleViewChange(vs, src)
+		return
+	} else if nv := m.GetNewView(); nv != nil {
+		s.handleNewView(nv, src)
+		return
 	}
 
 	if s.testBacklog(m, src) {
@@ -216,12 +222,6 @@ func (s *SBFT) handleQueueableMessage(m *Msg, src uint64) {
 	} else if c := m.GetCheckpoint(); c != nil {
 		s.handleCheckpoint(c, src)
 		return
-	} else if vs := m.GetViewChange(); vs != nil {
-		s.handleViewChange(vs, src)
-		return
-	} else if nv := m.GetNewView(); nv != nil {
-		s.handleNewView(nv, src)
-		return
 	}
 
 	log.Warningf("received invalid message from %d", src)