diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-27 02:06:54 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-27 02:06:54 +0800 |
| commit | a55f408c10ea7ed40e2bd843668b6eb6c2dc038b (patch) | |
| tree | 7b18a025625747508fe1642c4dff645eb23c8aab /cmd/geth/js.go | |
| parent | 39b1fe8e44d9a329ec076a6dd5af8312166096ba (diff) | |
| parent | e221a449e069783ca53fd02716066e66baeae1f0 (diff) | |
| download | dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.gz dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.bz2 dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.lz dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.xz dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.zst dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.zip | |
Merge pull request #1090 from fjl/jsre-fixes
jsre: fixes for concurrent use, improved timer handling
Diffstat (limited to 'cmd/geth/js.go')
| -rw-r--r-- | cmd/geth/js.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 342a80bd2..0fb234d45 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -104,7 +104,7 @@ func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain string, interactive boo func (js *jsre) apiBindings(f xeth.Frontend) { xe := xeth.New(js.ethereum, f) ethApi := rpc.NewEthereumApi(xe) - jeth := rpc.NewJeth(ethApi, js.re.ToVal, js.re) + jeth := rpc.NewJeth(ethApi, js.re) js.re.Set("jeth", struct{}{}) t, _ := js.re.Get("jeth") |