Merge branch 'develop' into FD-179

FactomProject · Jul 12, 2017 · c6c87e3 · c6c87e3
2 parents ba534ce + 7352d9f
commit c6c87e3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/engine/NetStart.go b/engine/NetStart.go
@@ -514,6 +514,12 @@ func startServers(load bool) {
 }
 
 func setupFirstAuthority(s *state.State) {
+	if len(s.Authorities) > 0 {
+		//Don't initialize first authority if we are loading during fast boot
+		//And there are already authorities present
+		return
+	}
+
 	var id state.Identity
 	if networkIdentity := s.GetNetworkBootStrapIdentity(); networkIdentity != nil {
 		id.IdentityChainID = networkIdentity