From 080dd712c3ee34e1f938b80bbbbda54a26d64abc Mon Sep 17 00:00:00 2001 From: Juha Hyttinen Date: Fri, 9 Oct 2020 09:51:12 +0300 Subject: [PATCH] Code violation fix Change-Id: Iebf70874d45c31879f8679b04f3a3e1ea3ed8851 Signed-off-by: Juha Hyttinen --- pkg/xapp/rmr.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go index 03fba67..8e9faef 100755 --- a/pkg/xapp/rmr.go +++ b/pkg/xapp/rmr.go @@ -409,8 +409,7 @@ func (m *RMRClient) Send(params *RMRParams, isRts bool) bool { func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool, whid int) int { var ( - currBuffer *C.rmr_mbuf_t - counterName string = "Transmitted" + currBuffer *C.rmr_mbuf_t ) m.contextMux.Lock() @@ -451,15 +450,21 @@ func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool, whid int) int { m.contextMux.Unlock() } - if currBuffer.state != C.RMR_OK { - counterName = "TransmitError" + if currBuffer == nil { + m.UpdateStatCounter("TransmitError") m.LogMBufError("SendBuf failed", currBuffer) + return int(C.RMR_ERR_INITFAILED) } - m.UpdateStatCounter(counterName) + if currBuffer.state != C.RMR_OK { + m.UpdateStatCounter("TransmitError") + m.LogMBufError("SendBuf failed", currBuffer) + } else { + m.UpdateStatCounter("Transmitted") + } defer m.Free(currBuffer) - return int(currBuffer.state) + } func (m *RMRClient) SendCallMsg(params *RMRParams) (int, string) { -- 2.16.6