sbft: do not blindly go active in view on hello message

corecode · Simon Schubert · commit 252d63058f10 · 2016-11-21T10:19:41.000Z
Change-Id: I6e1c70b575c59e2d9ca7981beca926ebd1c1bf73
Signed-off-by: Simon Schubert &lt;sis@zurich.ibm.com&gt;
diff --git a/orderer/sbft/simplebft/connection.go b/orderer/sbft/simplebft/connection.go
@@ -88,10 +88,10 @@ func (s *SBFT) handleHello(h *Hello, src uint64) {
 			return
 		}
 
-		if s.view < h.NewView.View {
+		if s.view <= h.NewView.View {
 			s.view = h.NewView.View
+			s.activeView = true
 		}
-		s.activeView = true
 	}
 
 	s.replicaState[src].hello = h

Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,10 @@ func (s SBFT) handleHello(h Hello, src uint64) {`
`88`	`88`	`return`
`89`	`89`	`}`
`90`	`90`
`91`		`- if s.view < h.NewView.View {`
	`91`	`+ if s.view <= h.NewView.View {`
`92`	`92`	`s.view = h.NewView.View`
	`93`	`+ s.activeView = true`
`93`	`94`	`}`
`94`		`- s.activeView = true`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`s.replicaState[src].hello = h`