Merge branch 'stop_inc_reqs' into gridx_master_ng

lorenzodonini#91

ocpp1.6/charge_point.go

@@ -2,6 +2,7 @@ package ocpp16
 
 import (
  "fmt"
+ "sync"
 
  "github.com/lorenzodonini/ocpp-go/internal/callbackqueue"
  "github.com/lorenzodonini/ocpp-go/ocpp"
@@ -28,6 +29,7 @@ type chargePoint struct {
  callbacks callbackqueue.CallbackQueue
  stopC chan struct{}
  errC chan error // external error channel
+ incomingWaitGroup sync.WaitGroup
 }
 
 func (cp *chargePoint) error(err error) {
@@ -332,8 +334,9 @@ func (cp *chargePoint) Start(centralSystemUrl string) error {
 }
 
 func (cp *chargePoint) Stop() {
- cp.client.Stop()
  close(cp.stopC)
+ cp.incomingWaitGroup.Wait()
+ cp.client.Stop()
 
  if cp.errC != nil {
  close(cp.errC)
@@ -358,6 +361,13 @@ func (cp *chargePoint) notSupportedError(requestId string, action string) {
 }
 
 func (cp *chargePoint) handleIncomingRequest(request ocpp.Request, requestId string, action string) {
+ cp.incomingWaitGroup.Add(1)
+ defer cp.incomingWaitGroup.Done()
+ select {
+ case <-cp.stopC:
+ return
+ default:
+ }
  profile, found := cp.client.GetProfileForFeature(action)
  // Check whether action is supported and a handler for it exists
  if !found {