From f534410e572e974126ef8ca6a15beb07f344fdab Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Wed, 9 Dec 2015 17:08:40 -0800
Subject: [PATCH] Fix state/execution ExecBlock() not rolling back

---
 state/execution.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/state/execution.go b/state/execution.go
index 69b533c89..2b4d57e6a 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -31,10 +31,7 @@ func (s *State) ExecBlock(proxyAppCtx proxy.AppContext, block *types.Block, bloc
 	nextValSet := valSet.Copy()
 
 	// First, rollback.
-	if err != nil {
-		proxyAppCtx.RollbackSync()
-		return err
-	}
+	proxyAppCtx.RollbackSync()
 
 	// Execute, or rollback. (Does not commit)
 	err = s.execBlockOnProxyApp(proxyAppCtx, block)