bugfix in startRPC error handling

This commit is contained in:
Bas van Kervel 2015-06-23 08:26:17 +02:00
parent 4ee7f6fc88
commit 57c911c398
1 changed files with 4 additions and 4 deletions

View File

@ -217,7 +217,6 @@ func (self *adminApi) SetSolc(req *shared.Request) (interface{}, error) {
} }
func (self *adminApi) StartRPC(req *shared.Request) (interface{}, error) { func (self *adminApi) StartRPC(req *shared.Request) (interface{}, error) {
var err error
args := new(StartRPCArgs) args := new(StartRPCArgs)
if err := self.coder.Decode(req.Params, &args); err != nil { if err := self.coder.Decode(req.Params, &args); err != nil {
return nil, shared.NewDecodeParamError(err.Error()) return nil, shared.NewDecodeParamError(err.Error())
@ -229,14 +228,15 @@ func (self *adminApi) StartRPC(req *shared.Request) (interface{}, error) {
CorsDomain: args.CorsDomain, CorsDomain: args.CorsDomain,
} }
if apis, err := ParseApiString(args.Apis, self.codec, self.xeth, self.ethereum); err == nil { apis, err := ParseApiString(args.Apis, self.codec, self.xeth, self.ethereum)
err = comms.StartHttp(cfg, self.codec, Merge(apis...)) if err != nil {
return false, err
} }
err = comms.StartHttp(cfg, self.codec, Merge(apis...))
if err == nil { if err == nil {
return true, nil return true, nil
} }
return false, err return false, err
} }