Fix merge problems

This commit is contained in:
TeoV
2019-02-18 11:09:17 +02:00
parent 79e957c334
commit c4e56cfe3f

View File

@@ -330,12 +330,10 @@ func (cdrS *CDRServer) raStoReThStaCDR(cdr *CDR,
// statSProcessEvent will send the event to StatS if the connection is configured
func (cdrS *CDRServer) attrSProcessEvent(cgrEv *utils.CGREvent) (err error) {
if cgrEv.Context == nil { // populate if not already in
cgrEv.Context = utils.StringPointer(utils.MetaCDRs)
}
var rplyEv AttrSProcessEventReply
if err = cdrS.attrS.Call(utils.AttributeSv1ProcessEvent,
&AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaCDRs),
CGREvent: *cgrEv},
&rplyEv); err == nil && len(rplyEv.AlteredFields) != 0 {
*cgrEv = *rplyEv.CGREvent