sbft: accept new view even if we are not in view change

corecode · Simon Schubert · commit 6d53b1eccda5 · 2016-11-22T10:45:53.000Z
Change-Id: Ic7499c3a41729a882e346cd005f5beea26c04605
Signed-off-by: Simon Schubert &lt;sis@zurich.ibm.com&gt;
diff --git a/orderer/sbft/simplebft/newview.go b/orderer/sbft/simplebft/newview.go
@@ -141,6 +141,11 @@ func (s *SBFT) handleNewView(nv *NewView, src uint64) {
 
 	s.replicaState[s.primaryIDView(nv.View)].newview = nv
 
+	if nv.View > s.view {
+		s.view = nv.View
+		s.activeView = false
+	}
+
 	s.processNewView()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,11 @@ func (s SBFT) handleNewView(nv NewView, src uint64) {`
`141`	`141`
`142`	`142`	`s.replicaState[s.primaryIDView(nv.View)].newview = nv`
`143`	`143`
	`144`	`+ if nv.View > s.view {`
	`145`	`+ s.view = nv.View`
	`146`	`+ s.activeView = false`
	`147`	`+ }`
	`148`	`+`
`144`	`149`	`s.processNewView()`
`145`	`150`	`}`
`146`	`151`