interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

javascript: remove unused quit channel 

This fixes the hang in JSRE.Stop.
This commit is contained in:
Felix Lange 2014-10-29 03:00:29 +01:00
parent 5920aa7be6
commit 8170f96ded
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
javascript/javascript_runtime.go
View File

@ -25,8 +25,7 @@ type JSRE struct {
Vm *otto.Otto Vm *otto.Otto
pipe *ethpipe.JSPipe pipe *ethpipe.JSPipe
events event.Subscription events event.Subscription
quitChan chan bool
objectCb map[string][]otto.Value objectCb map[string][]otto.Value
} }
@ -51,7 +50,6 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
otto.New(), otto.New(),
ethpipe.NewJSPipe(ethereum), ethpipe.NewJSPipe(ethereum),
nil, nil,
make(chan bool),
make(map[string][]otto.Value), make(map[string][]otto.Value),
} }
@ -104,10 +102,6 @@ func (self *JSRE) Require(file string) error {
func (self *JSRE) Stop() { func (self *JSRE) Stop() {
self.events.Unsubscribe() self.events.Unsubscribe()
// Kill the main loop
self.quitChan <- true
close(self.quitChan)
jsrelogger.Infoln("stopped") jsrelogger.Infoln("stopped")
} }