diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-25 01:59:14 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-25 01:59:14 +0800 |
| commit | 544b7fba7f2e826bc7c4eef016082b266d17e5f6 (patch) | |
| tree | 85d7849fdf340a00349979cc481058d44a7c59ef /ethtrie | |
| parent | b66fcf85dfecb13c3ed2b9f46ad6bb257ce84411 (diff) | |
| parent | cba2f6c2c472d5818541f6eabf3e18196d0c477d (diff) | |
| download | dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.gz dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.bz2 dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.lz dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.xz dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.zst dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.zip | |
Merge branch 'tmp' into develop
Conflicts:
peer.go
Diffstat (limited to 'ethtrie')
| -rw-r--r-- | ethtrie/trie.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ethtrie/trie.go b/ethtrie/trie.go index e6e09dd0d..695ff436a 100644 --- a/ethtrie/trie.go +++ b/ethtrie/trie.go @@ -196,8 +196,8 @@ func (t *Trie) Update(key, value string) { } func (t *Trie) Get(key string) string { - t.mut.RLock() - defer t.mut.RUnlock() + t.mut.Lock() + defer t.mut.Unlock() k := CompactHexDecode(key) c := ethutil.NewValue(t.getState(t.Root, k)) |