diff options
| -rw-r--r-- | fnet/src/tests/frt/rpc/sharedblob.cpp | 10 | ||||
| -rw-r--r-- | slobrok/src/vespa/slobrok/server/rpcmirror.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/fnet/src/tests/frt/rpc/sharedblob.cpp b/fnet/src/tests/frt/rpc/sharedblob.cpp index a94a322d7cc..7c34739e380 100644 --- a/fnet/src/tests/frt/rpc/sharedblob.cpp +++ b/fnet/src/tests/frt/rpc/sharedblob.cpp @@ -130,7 +130,7 @@ TEST("testExplicitShared") { req->GetParams()->AddInt32(84); req->GetParams()->AddSharedData(&blob); - EXPECT_TRUE(blob.refcnt == 4); + EXPECT_EQUAL(4, blob.refcnt); EXPECT_TRUE(strcmp(req->GetParamSpec(), "xixix") == 0); EXPECT_TRUE(req->GetParams()->GetValue(0)._data._len == blob.getLen()); EXPECT_TRUE(req->GetParams()->GetValue(0)._data._buf == blob.getData()); @@ -143,7 +143,7 @@ TEST("testExplicitShared") { req->CreateRequestPacket(true)->Free(); // fake request send. - EXPECT_TRUE(blob.refcnt == 1); + EXPECT_EQUAL(1, blob.refcnt); EXPECT_TRUE(strcmp(req->GetParamSpec(), "xixix") == 0); EXPECT_TRUE(req->GetParams()->GetValue(0)._data._len == 0); EXPECT_TRUE(req->GetParams()->GetValue(0)._data._buf == NULL); @@ -154,7 +154,9 @@ TEST("testExplicitShared") { EXPECT_TRUE(req->GetParams()->GetValue(4)._data._len == 0); EXPECT_TRUE(req->GetParams()->GetValue(4)._data._buf == NULL); + EXPECT_EQUAL(1, blob.refcnt); req = orb.AllocRPCRequest(req); + EXPECT_EQUAL(1, blob.refcnt); req->GetParams()->AddSharedData(&blob); req->GetParams()->AddInt32(42); @@ -162,9 +164,9 @@ TEST("testExplicitShared") { req->GetParams()->AddInt32(84); req->GetParams()->AddSharedData(&blob); - EXPECT_TRUE(blob.refcnt == 4); + EXPECT_EQUAL(4, blob.refcnt); req->SubRef(); - EXPECT_TRUE(blob.refcnt == 1); + EXPECT_EQUAL(1, blob.refcnt); } TEST("testImplicitShared") { diff --git a/slobrok/src/vespa/slobrok/server/rpcmirror.cpp b/slobrok/src/vespa/slobrok/server/rpcmirror.cpp index 3523e2bbfad..1ea6e3b4742 100644 --- a/slobrok/src/vespa/slobrok/server/rpcmirror.cpp +++ b/slobrok/src/vespa/slobrok/server/rpcmirror.cpp @@ -115,7 +115,7 @@ IncrementalFetch::IncrementalFetch(FRT_Supervisor *orb, { } IncrementalFetch::~IncrementalFetch() { } - + void IncrementalFetch::completeReq() { |