Updating to newer xapp-frame 0.0.30 version. Prepared also for 4.* version
Change-Id: I86866b1e57bbc84421eb365d38b62839c8954f50
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>
diff --git a/pkg/teststub/controlRmr.go b/pkg/teststub/controlRmr.go
index bcea500..f47bafa 100644
--- a/pkg/teststub/controlRmr.go
+++ b/pkg/teststub/controlRmr.go
@@ -46,8 +46,10 @@
tc.TestWrapper.Init(desc)
os.Setenv("RMR_SEED_RT", rtfile)
os.Setenv("RMR_SRC_ID", "localhost:"+port)
+ //os.Setenv("RMR_RTG_SVC", "localhost:"+port)
xapp.Logger.Info("Using rt file %s", os.Getenv("RMR_SEED_RT"))
xapp.Logger.Info("Using src id %s", os.Getenv("RMR_SRC_ID"))
+ //xapp.Logger.Info("Using rtg svc %s", os.Getenv("RMR_RTG_SVC"))
tc.syncChan = make(chan struct{})
}
diff --git a/pkg/teststub/controlRmrStub.go b/pkg/teststub/controlRmrStub.go
index e486d13..05a8e32 100644
--- a/pkg/teststub/controlRmrStub.go
+++ b/pkg/teststub/controlRmrStub.go
@@ -74,7 +74,7 @@
tc.RmrControl.Init(desc, rtfile, port)
tc.RmrWrapper.Init()
- tc.Rmr = xapp.NewRMRClientWithParams("tcp:"+port, 4096, 1, stat)
+ tc.Rmr = xapp.NewRMRClientWithParams("tcp:"+port, 65534, 1, 0, stat)
tc.Rmr.SetReadyCB(tc.ReadyCB, nil)
go tc.Rmr.Start(tc)
diff --git a/pkg/xapptweaks/rmrwrapper.go b/pkg/xapptweaks/rmrwrapper.go
index 5d59363..09fa6de 100644
--- a/pkg/xapptweaks/rmrwrapper.go
+++ b/pkg/xapptweaks/rmrwrapper.go
@@ -66,8 +66,10 @@
}
if status == false {
err = fmt.Errorf("Failed with retries(%d) %s", i, params.String())
- tc.Rmr.Free(params.Mbuf)
- params.Mbuf = nil
+ if params.Mbuf != nil {
+ tc.Rmr.Free(params.Mbuf)
+ params.Mbuf = nil
+ }
} else {
tc.CntSentMsg++
}