aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-06 23:43:34 +0800
committerobscuren <geffobscura@gmail.com>2014-05-06 23:43:34 +0800
commit76d7bad722dd4e5a94a3665ad94af65e2f421a8b (patch)
tree780b8a515799641420d4de0159f76b0c09fe0b2d /ethereum.go
parenta0af7de58eeba598c8e967ae9deefb4ee287a1df (diff)
parent050684450befaac8972120688b69825e8f0acbca (diff)
downloadgo-tangerine-76d7bad722dd4e5a94a3665ad94af65e2f421a8b.tar
go-tangerine-76d7bad722dd4e5a94a3665ad94af65e2f421a8b.tar.gz
go-tangerine-76d7bad722dd4e5a94a3665ad94af65e2f421a8b.tar.bz2
go-tangerine-76d7bad722dd4e5a94a3665ad94af65e2f421a8b.tar.lz
go-tangerine-76d7bad722dd4e5a94a3665ad94af65e2f421a8b.tar.xz
go-tangerine-76d7bad722dd4e5a94a3665ad94af65e2f421a8b.tar.zst
go-tangerine-76d7bad722dd4e5a94a3665ad94af65e2f421a8b.zip
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Diffstat (limited to 'ethereum.go')
-rw-r--r--ethereum.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/ethereum.go b/ethereum.go
index 707938639..2f4db7336 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -339,7 +339,9 @@ func (s *Ethereum) Stop() {
close(s.quit)
- s.RpcServer.Stop()
+ if s.RpcServer != nil {
+ s.RpcServer.Stop()
+ }
s.txPool.Stop()
s.stateManager.Stop()