Merge branch 'rpcxeth' into rpcfrontier

Conflicts: rpc/api.go
2015-03-20 15:25:43 +01:00
parent 41c493ace9 0cde7a4d46
commit 28e1971272
7 changed files with 554 additions and 667 deletions
--- a/event/filter/eth_filter.go
+++ b/event/filter/eth_filter.go
@ -48,7 +48,9 @@ func (self *FilterManager) InstallFilter(filter *core.Filter) (id int) {
 func (self *FilterManager) UninstallFilter(id int) {
 	self.filterMu.Lock()
 	defer self.filterMu.Unlock()
-	delete(self.filters, id)
+	if _, ok := self.filters[id]; ok {
+		delete(self.filters, id)
+	}
 }

 // GetFilter retrieves a filter installed using InstallFilter.