This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new fe5bec1 GEODE-5698: Fixes shared_ptr access.
fe5bec1 is described below
commit fe5bec1051700356c42c07ea7061cc9e36c243b7
Author: Jacob Barrett <[email protected]>
AuthorDate: Wed Sep 5 21:51:43 2018 -0700
GEODE-5698: Fixes shared_ptr access.
---
.clang-tidy | 2 +-
.../integration-test/ThinClientVersionedOps.hpp | 359 ++++++++++-----------
.../testThinClientInterest1_Bug1001.cpp | 2 +-
.../integration-test/testThinClientPdxInstance.cpp | 141 +++-----
.../integration-test/testThinClientPdxTests.cpp | 4 +-
cppcache/src/CacheImpl.cpp | 2 +-
cppcache/src/ClientProxyMembershipID.cpp | 7 +-
.../src/InternalCacheTransactionManager2PCImpl.cpp | 5 +-
cppcache/src/LocalRegion.cpp | 9 +-
cppcache/src/MapSegment.cpp | 15 +-
cppcache/src/MapSegment.hpp | 2 +-
cppcache/src/Pool.cpp | 3 +-
cppcache/src/ThinClientRegion.cpp | 67 ++--
13 files changed, 283 insertions(+), 335 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index 3f9fb9d..916b0a1 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,6 @@
---
Checks:
'-*,clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,google-*,-google-readability-todo,-google-runtime-references'
-WarningsAsErrors: 'google-build-using-namespace'
+WarningsAsErrors:
'google-build-using-namespace,google-readability-redundant-smartptr-get'
HeaderFilterRegex: '\.(h|hpp)$'
AnalyzeTemporaryDtors: false
FormatStyle: file
diff --git a/cppcache/integration-test/ThinClientVersionedOps.hpp
b/cppcache/integration-test/ThinClientVersionedOps.hpp
index 70090d6..2e06b24 100644
--- a/cppcache/integration-test/ThinClientVersionedOps.hpp
+++ b/cppcache/integration-test/ThinClientVersionedOps.hpp
@@ -135,7 +135,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StartClient1)
// 0/*redundancy*/, true/*clientNotification*/,
// -1/*subscriptionAckInterval*/,
// 5/*connections*/, 60000/*loadConditioningInterval*/);
- //auto regPtr0 = createRegionAndAttachPool(regNames[0],USE_ACK,
+ // auto regPtr0 = createRegionAndAttachPool(regNames[0],USE_ACK,
// nullptr);
initClient(true);
@@ -176,7 +176,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StartClient2)
getHelper()->createPoolWithLocators("__TEST_POOL1__", locatorsG, true, -1,
std::chrono::milliseconds::zero(), -1,
false, group2);
- auto regPtr0 = getHelper()->createRegionAndAttachPool(
+ auto regPtr0 = getHelper()->createRegionAndAttachPool(
regNames[0], USE_ACK, "__TEST_POOL1__", true);
LOG("StepOne_Pooled_Locator1 complete.");
@@ -198,13 +198,12 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT2, transactionPutOnClient2)
{
- auto rptr = getHelper()->getRegion(regNames[0]);
- auto txManager =
- getHelper()->getCache()->getCacheTransactionManager();
+ auto rptr = getHelper()->getRegion(regNames[0]);
+ auto txManager = getHelper()->getCache()->getCacheTransactionManager();
- txManager->begin();
- auto keyPtr1 = CacheableKey::create("key-1");
- auto valPtr = CacheableString::create("client2-value1");
+ txManager->begin();
+ auto keyPtr1 = CacheableKey::create("key-1");
+ auto valPtr = CacheableString::create("client2-value1");
rptr->put(keyPtr1, valPtr);
auto keyPtr2 = CacheableKey::create("key-2");
@@ -251,11 +250,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, transactionPutOnClient2)
"Val3 = %s ",
c2v13->value().c_str(), s2v13->value().c_str());
- ASSERT(*c2v11.get() == *c2v11.get(),
+ ASSERT(*c2v11 == *c2v11,
"transactionPutOnClient2:Values should be equal-1");
- ASSERT(*c2v12.get() == *c2v12.get(),
+ ASSERT(*c2v12 == *c2v12,
"transactionPutOnClient2:Values should be equal-2");
- ASSERT(*c2v13.get() == *c2v13.get(),
+ ASSERT(*c2v13 == *c2v13,
"transactionPutOnClient2:Values should be equal-3");
LOG("CLIENT-2 :: TASK: transactionPutOnClient2 completed successfully");
@@ -267,56 +266,53 @@ DUNIT_TASK_DEFINITION(CLIENT1, verifyGetonClient1)
thread4->stop();
delete thread4;
- auto rptr = getHelper()->getRegion(regNames[0]);
-
- auto keyPtr1 = CacheableKey::create("key-1");
- auto keyPtr2 = CacheableKey::create("key-2");
- auto keyPtr3 = CacheableKey::create("key-3");
-
- // localGet
- c1v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1));
- c1v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2));
- c1v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3));
-
- // localDestroy
- rptr->localDestroy(keyPtr1);
- rptr->localDestroy(keyPtr2);
- rptr->localDestroy(keyPtr3);
-
- // remoteGet
- s1v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1));
- s1v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2));
- s1v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3));
-
- // Print remoteGet Values
- LOGINFO(
- "CLIENT-2 :: verifyGetonClient1: localGet Val1 = %s remoteGet Val1 = "
- "%s ",
- c1v11->value().c_str(), s1v11->value().c_str());
- LOGINFO(
- "CLIENT-2 :: verifyGetonClient1: localGet Val2 = %s remoteGet Val2 = "
- "%s ",
- c1v12->value().c_str(), s1v12->value().c_str());
- LOGINFO(
- "CLIENT-2 :: verifyGetonClient1: localGet Val3 = %s remoteGet Val3 = "
- "%s ",
- c1v13->value().c_str(), s1v13->value().c_str());
-
- ASSERT(*c1v11.get() == *s1v11.get(),
- "verifyGetonClient1:Values should be equal-1");
- ASSERT(*c1v12.get() == *s1v12.get(),
- "verifyGetonClient1:Values should be equal-2");
- ASSERT(*c1v13.get() == *s1v13.get(),
- "verifyGetonClient1:Values should be equal-3");
-
- LOG("CLIENT-2 :: TASK: verifyGetonClient1 completed successfully");
+ auto rptr = getHelper()->getRegion(regNames[0]);
+
+ auto keyPtr1 = CacheableKey::create("key-1");
+ auto keyPtr2 = CacheableKey::create("key-2");
+ auto keyPtr3 = CacheableKey::create("key-3");
+
+ // localGet
+ c1v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1));
+ c1v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2));
+ c1v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3));
+
+ // localDestroy
+ rptr->localDestroy(keyPtr1);
+ rptr->localDestroy(keyPtr2);
+ rptr->localDestroy(keyPtr3);
+
+ // remoteGet
+ s1v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1));
+ s1v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2));
+ s1v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3));
+
+ // Print remoteGet Values
+ LOGINFO(
+ "CLIENT-2 :: verifyGetonClient1: localGet Val1 = %s remoteGet Val1 = "
+ "%s ",
+ c1v11->value().c_str(), s1v11->value().c_str());
+ LOGINFO(
+ "CLIENT-2 :: verifyGetonClient1: localGet Val2 = %s remoteGet Val2 = "
+ "%s ",
+ c1v12->value().c_str(), s1v12->value().c_str());
+ LOGINFO(
+ "CLIENT-2 :: verifyGetonClient1: localGet Val3 = %s remoteGet Val3 = "
+ "%s ",
+ c1v13->value().c_str(), s1v13->value().c_str());
+
+ ASSERT(*c1v11 == *s1v11, "verifyGetonClient1:Values should be equal-1");
+ ASSERT(*c1v12 == *s1v12, "verifyGetonClient1:Values should be equal-2");
+ ASSERT(*c1v13 == *s1v13, "verifyGetonClient1:Values should be equal-3");
+
+ LOG("CLIENT-2 :: TASK: verifyGetonClient1 completed successfully");
}
END_TASK_DEFINITION
//
DUNIT_TASK_DEFINITION(CLIENT1, PutOnClient1)
{
- auto rptr = getHelper()->getRegion(regNames[0]);
+ auto rptr = getHelper()->getRegion(regNames[0]);
thread1 = new putThread(rptr, false);
thread1->setParams(0, 5, 1, true, false, 1);
thread1->start();
@@ -326,7 +322,7 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT2, PutOnClient2)
{
- auto rptr = getHelper()->getRegion(regNames[0]);
+ auto rptr = getHelper()->getRegion(regNames[0]);
thread2 = new putThread(rptr, false);
thread2->setParams(0, 5, 1, false, false, 0); // 0, 5, 1, false, false, 0
thread2->start();
@@ -360,147 +356,138 @@ DUNIT_TASK_DEFINITION(CLIENT1, GetOnClient1)
thread1->stop();
delete thread1;
dunit::sleep(3000);
- auto regPtr = getHelper()->getRegion(regNames[0]);
+ auto regPtr = getHelper()->getRegion(regNames[0]);
// localGet
- auto keyPtr1 = CacheableKey::create("key-1");
- auto keyPtr2 = CacheableKey::create("key-2");
- auto keyPtr3 = CacheableKey::create("key-3");
- auto keyPtr4 = CacheableKey::create("key-4");
- auto keyPtr5 = CacheableKey::create("key-5");
-
- c1v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
- c1v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
- c1v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
- c1v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
- c1v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
-
- // Print local Get Values
- LOGINFO("CLIENT-1 :: local GET operation -6 c1v11 = %s",
- c1v11->value().c_str());
- LOGINFO("CLIENT-1 :: local GET operation -7 c1v12 = %s",
- c1v12->value().c_str());
- LOGINFO("CLIENT-1 :: local GET operation -8 c1v13 = %s",
- c1v13->value().c_str());
- LOGINFO("CLIENT-1 :: local GET operation -9 c1v14=%s",
- c1v14->value().c_str());
- LOGINFO("CLIENT-1 :: local GET operation....Done c1v15=%s",
- c1v15->value().c_str());
-
- // localDestroy
- regPtr->localDestroy(keyPtr1);
- regPtr->localDestroy(keyPtr2);
- regPtr->localDestroy(keyPtr3);
- regPtr->localDestroy(keyPtr4);
- regPtr->localDestroy(keyPtr5);
-
- LOG("CLIENT-1 :: localDestroy() operation....Done");
-
- // remoteGet
- s1v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
- s1v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
- s1v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
- s1v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
- s1v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
-
- // Print remoteGet Values
- LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v11 = %s",
- s1v11->value().c_str());
- LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v12 = %s",
- s1v12->value().c_str());
- LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v13 = %s",
- s1v13->value().c_str());
- LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v14 = %s",
- s1v14->value().c_str());
- LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v15 = %s",
- s1v15->value().c_str());
-
- ASSERT(*c1v11.get() == *s1v11.get(),
- "GetOnClient1:Values should be equal-1");
- ASSERT(*c1v12.get() == *s1v12.get(),
- "GetOnClient1:Values should be equal-2");
- ASSERT(*c1v13.get() == *s1v13.get(),
- "GetOnClient1:Values should be equal-3");
- ASSERT(*c1v14.get() == *s1v14.get(),
- "GetOnClient1:Values should be equal-4");
- ASSERT(*c1v15.get() == *s1v15.get(),
- "GetOnClient1:Values should be equal-5");
- LOG("CLIENT-1 ::local GET operation....Done");
+ auto keyPtr1 = CacheableKey::create("key-1");
+ auto keyPtr2 = CacheableKey::create("key-2");
+ auto keyPtr3 = CacheableKey::create("key-3");
+ auto keyPtr4 = CacheableKey::create("key-4");
+ auto keyPtr5 = CacheableKey::create("key-5");
+
+ c1v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
+ c1v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
+ c1v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
+ c1v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
+ c1v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
+
+ // Print local Get Values
+ LOGINFO("CLIENT-1 :: local GET operation -6 c1v11 = %s",
+ c1v11->value().c_str());
+ LOGINFO("CLIENT-1 :: local GET operation -7 c1v12 = %s",
+ c1v12->value().c_str());
+ LOGINFO("CLIENT-1 :: local GET operation -8 c1v13 = %s",
+ c1v13->value().c_str());
+ LOGINFO("CLIENT-1 :: local GET operation -9 c1v14=%s",
+ c1v14->value().c_str());
+ LOGINFO("CLIENT-1 :: local GET operation....Done c1v15=%s",
+ c1v15->value().c_str());
+
+ // localDestroy
+ regPtr->localDestroy(keyPtr1);
+ regPtr->localDestroy(keyPtr2);
+ regPtr->localDestroy(keyPtr3);
+ regPtr->localDestroy(keyPtr4);
+ regPtr->localDestroy(keyPtr5);
+
+ LOG("CLIENT-1 :: localDestroy() operation....Done");
+
+ // remoteGet
+ s1v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
+ s1v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
+ s1v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
+ s1v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
+ s1v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
+
+ // Print remoteGet Values
+ LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v11 = %s",
+ s1v11->value().c_str());
+ LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v12 = %s",
+ s1v12->value().c_str());
+ LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v13 = %s",
+ s1v13->value().c_str());
+ LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v14 = %s",
+ s1v14->value().c_str());
+ LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v15 = %s",
+ s1v15->value().c_str());
+
+ ASSERT(*c1v11 == *s1v11, "GetOnClient1:Values should be equal-1");
+ ASSERT(*c1v12 == *s1v12, "GetOnClient1:Values should be equal-2");
+ ASSERT(*c1v13 == *s1v13, "GetOnClient1:Values should be equal-3");
+ ASSERT(*c1v14 == *s1v14, "GetOnClient1:Values should be equal-4");
+ ASSERT(*c1v15 == *s1v15, "GetOnClient1:Values should be equal-5");
+ LOG("CLIENT-1 ::local GET operation....Done");
}
END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT2, GetOnClient2)
{
- auto regPtr = getHelper()->getRegion(regNames[0]);
+ auto regPtr = getHelper()->getRegion(regNames[0]);
thread2->stop();
delete thread2;
dunit::sleep(3000);
// localGet
- auto keyPtr1 = CacheableKey::create("key-1");
- auto keyPtr2 = CacheableKey::create("key-2");
- auto keyPtr3 = CacheableKey::create("key-3");
- auto keyPtr4 = CacheableKey::create("key-4");
- auto keyPtr5 = CacheableKey::create("key-5");
-
- c2v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
- c2v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
- c2v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
- c2v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
- c2v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
-
- // Print localGets
- // Print local Get Values
- LOGINFO("CLIENT-2 :: local GET operation c2v11 = %s",
- c2v11->value().c_str());
- LOGINFO("CLIENT-2 :: local GET operation c2v12 = %s",
- c2v12->value().c_str());
- LOGINFO("CLIENT-2 :: local GET operation c2v13 = %s",
- c2v13->value().c_str());
- LOGINFO("CLIENT-2 :: local GET operation c2v14=%s",
c2v14->value().c_str());
- LOGINFO("CLIENT-2 :: local GET operation....Done c2v15=%s",
- c2v15->value().c_str());
-
- LOG("CLIENT-2 :: local GET operation....Done");
-
- // localDestroy
- regPtr->localDestroy(keyPtr1);
- regPtr->localDestroy(keyPtr2);
- regPtr->localDestroy(keyPtr3);
- regPtr->localDestroy(keyPtr4);
- regPtr->localDestroy(keyPtr5);
- LOG("CLIENT-2 :: localDestroy() operation....Done");
-
- // remoteGet
- s2v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
- s2v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
- s2v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
- s2v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
- s2v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
-
- // Print remoteGet Values
- LOGINFO("CLIENT-2 :: remoteGet operation s2v11 = %s",
- s2v11->value().c_str());
- LOGINFO("CLIENT-2 :: remoteGet operation s2v12 = %s",
- s2v12->value().c_str());
- LOGINFO("CLIENT-2 :: remoteGet operation s2v13 = %s",
- s2v13->value().c_str());
- LOGINFO("CLIENT-2 :: remoteGet operation s2v14 = %s",
- s2v14->value().c_str());
- LOGINFO("CLIENT-2 :: remoteGet operation s2v15 = %s",
- s2v15->value().c_str());
-
- ASSERT(*c2v11.get() == *s2v11.get(),
- "GetOnClient2:Values should be equal-1");
- ASSERT(*c2v12.get() == *s2v12.get(),
- "GetOnClient2:Values should be equal-2");
- ASSERT(*c2v13.get() == *s2v13.get(),
- "GetOnClient2:Values should be equal-3");
- ASSERT(*c2v14.get() == *s2v14.get(),
- "GetOnClient2:Values should be equal-4");
- ASSERT(*c2v15.get() == *s2v15.get(),
- "GetOnClient2:Values should be equal-5");
-
- LOG("GetOnClient2 completed");
+ auto keyPtr1 = CacheableKey::create("key-1");
+ auto keyPtr2 = CacheableKey::create("key-2");
+ auto keyPtr3 = CacheableKey::create("key-3");
+ auto keyPtr4 = CacheableKey::create("key-4");
+ auto keyPtr5 = CacheableKey::create("key-5");
+
+ c2v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
+ c2v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
+ c2v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
+ c2v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
+ c2v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
+
+ // Print localGets
+ // Print local Get Values
+ LOGINFO("CLIENT-2 :: local GET operation c2v11 = %s",
+ c2v11->value().c_str());
+ LOGINFO("CLIENT-2 :: local GET operation c2v12 = %s",
+ c2v12->value().c_str());
+ LOGINFO("CLIENT-2 :: local GET operation c2v13 = %s",
+ c2v13->value().c_str());
+ LOGINFO("CLIENT-2 :: local GET operation c2v14=%s",
+ c2v14->value().c_str());
+ LOGINFO("CLIENT-2 :: local GET operation....Done c2v15=%s",
+ c2v15->value().c_str());
+
+ LOG("CLIENT-2 :: local GET operation....Done");
+
+ // localDestroy
+ regPtr->localDestroy(keyPtr1);
+ regPtr->localDestroy(keyPtr2);
+ regPtr->localDestroy(keyPtr3);
+ regPtr->localDestroy(keyPtr4);
+ regPtr->localDestroy(keyPtr5);
+ LOG("CLIENT-2 :: localDestroy() operation....Done");
+
+ // remoteGet
+ s2v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1));
+ s2v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2));
+ s2v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3));
+ s2v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4));
+ s2v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5));
+
+ // Print remoteGet Values
+ LOGINFO("CLIENT-2 :: remoteGet operation s2v11 = %s",
+ s2v11->value().c_str());
+ LOGINFO("CLIENT-2 :: remoteGet operation s2v12 = %s",
+ s2v12->value().c_str());
+ LOGINFO("CLIENT-2 :: remoteGet operation s2v13 = %s",
+ s2v13->value().c_str());
+ LOGINFO("CLIENT-2 :: remoteGet operation s2v14 = %s",
+ s2v14->value().c_str());
+ LOGINFO("CLIENT-2 :: remoteGet operation s2v15 = %s",
+ s2v15->value().c_str());
+
+ ASSERT(*c2v11 == *s2v11, "GetOnClient2:Values should be equal-1");
+ ASSERT(*c2v12 == *s2v12, "GetOnClient2:Values should be equal-2");
+ ASSERT(*c2v13 == *s2v13, "GetOnClient2:Values should be equal-3");
+ ASSERT(*c2v14 == *s2v14, "GetOnClient2:Values should be equal-4");
+ ASSERT(*c2v15 == *s2v15, "GetOnClient2:Values should be equal-5");
+
+ LOG("GetOnClient2 completed");
}
END_TASK_DEFINITION
diff --git a/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
b/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
index 61e2f4f..6ad63aa 100644
--- a/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
+++ b/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
@@ -227,7 +227,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
CheckUpdateASCIIAsWideStrings)
auto val = std::dynamic_pointer_cast<CacheableString>(reg0->get(key));
auto expectedVal = getUAString(index + 10);
ASSERT(val != nullptr, "expected non-null value in get");
- ASSERT(*val.get() == *expectedVal.get(), "unexpected value in get");
+ ASSERT(*val == *expectedVal, "unexpected value in get");
}
LOG("CheckUpdateASCIIAsWideStrings complete.");
}
diff --git a/cppcache/integration-test/testThinClientPdxInstance.cpp
b/cppcache/integration-test/testThinClientPdxInstance.cpp
index 1970973..2509627 100644
--- a/cppcache/integration-test/testThinClientPdxInstance.cpp
+++ b/cppcache/integration-test/testThinClientPdxInstance.cpp
@@ -441,7 +441,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxIdentityField)
"pdxInstanceDeserializationTime should be greater than 0.");
bool ret = false;
- ret = (*pi.get() == *pi2.get());
+ ret = (*pi == *pi2);
LOGINFO("PdxObject ret = %d ", ret);
ASSERT(ret == true, "Both PdxInstances should be equal.");
@@ -490,14 +490,14 @@ DUNIT_TASK_DEFINITION(CLIENT2,
verifyCacheableObjectArrayWithPdxField)
auto newAddrPtr = std::make_shared<Address>(static_cast<int32_t>(i + 1),
streetStr, cityStr);
LOG("AddressPtr created using new....");
- ASSERT(addrPtr.get()->equals(*(newAddrPtr.get())) == true,
+ ASSERT(addrPtr->equals(*newAddrPtr) == true,
"Both PdxInstances should be equal.");
auto retPtr = pdxFactory.create();
LOG("PdxInstancePtr created....");
bool ret = false;
- ret = (*pi.get() == *retPtr.get());
+ ret = (*pi == *retPtr);
LOGINFO("PdxObject ret = %d ", ret);
ASSERT(ret == true, "Both PdxInstances should be equal.");
}
@@ -552,7 +552,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxNullIdentityFieldHC)
rptr->get(CacheableInt32::create(2)));
bool ret = false;
- ret = (*pi.get() == *pi2.get());
+ ret = (*pi == *pi2);
LOGINFO("PdxObject ret = %d ", ret);
ASSERT(ret == true, "Both PdxInstances should be equal.");
@@ -813,7 +813,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxInstanceEquals)
LOG("get2 Successfully....");
bool ret = false;
- ret = (*pIPtr1.get() == *pIPtr2.get());
+ ret = (*pIPtr1 == *pIPtr2);
LOGINFO("PdxObject ret = %d ", ret);
ASSERT(ret == true, "Both PdxInstances should be equal.");
@@ -823,7 +823,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxInstanceEquals)
LOG("parentPdx get2 Successfully....");
ret = false;
- ret = (*pIPtr1.get() == *pIPtr2.get());
+ ret = (*pIPtr1 == *pIPtr2);
LOGINFO("parentPdx ret = %d ", ret);
ASSERT(ret == true, "Both PdxInstances should be equal.");
@@ -1206,14 +1206,14 @@ DUNIT_TASK_DEFINITION(CLIENT2, accessPdxInstance)
auto newAddrPtr = std::make_shared<Address>(static_cast<int32_t>(i + 1),
streetStr, cityStr);
LOG("AddressPtr created using new....");
- ASSERT(addrPtr.get()->equals(*(newAddrPtr.get())) == true,
+ ASSERT(addrPtr->equals(*newAddrPtr) == true,
"Both PdxInstances should be equal.");
auto retPtr = pdxFactory.create();
LOG("PdxInstancePtr created....");
bool ret = false;
- ret = (*pi.get() == *retPtr.get());
+ ret = (*pi == *retPtr);
LOGINFO("PdxObject ret = %d ", ret);
ASSERT(ret == true, "Both PdxInstances should be equal.");
}
@@ -1230,8 +1230,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, accessPdxInstance)
LOGINFO("got childPdx getObject ");
auto childpdxobjPtr = std::make_shared<ChildPdx>(1);
LOGINFO("created new childPdx");
- ASSERT((cpo.get()->equals(*childpdxobjPtr.get())) == true,
- "child pdx should be equal");
+ ASSERT(cpo->equals(*childpdxobjPtr) == true, "child pdx should be equal");
LOG("accessPdxInstance complete");
}
END_TASK_DEFINITION
@@ -1260,8 +1259,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_int32") == true, "m_int32 = true expected");
newVal = newPiPtr->getIntField("m_int32");
ASSERT(val + 1 == newVal, "val + 1 == newVal expected");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1282,8 +1280,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_bool") == true, "m_bool = true expected");
boolVal = newPiPtr->getBooleanField("m_bool");
ASSERT(boolVal == false, "bool is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1316,8 +1313,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_byte") == true, "m_byte = true expected");
byteVal = newPiPtr->getByteField("m_byte");
ASSERT(byteVal == setByteVal, "byte is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
signed char setSByteVal = 0x57;
wpiPtr = pIPtr->createWriter();
@@ -1327,8 +1323,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_sbyte") == true, "m_sbyte = true expected");
byteVal = newPiPtr->getByteField("m_sbyte");
ASSERT(byteVal == setSByteVal, "m_sbyte is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1349,8 +1344,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_int16") == true, "m_int16 = true expected");
shortVal = newPiPtr->getShortField("m_int16");
ASSERT(shortVal == 0x5678, "short is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1371,8 +1365,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_long") == true, "m_long = true expected");
longVal = newPiPtr->getLongField("m_long");
ASSERT(longVal == 0x56787878, "long is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1393,8 +1386,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_float") == true, "m_float = true expected");
fVal = newPiPtr->getFloatField("m_float");
ASSERT(fVal == 18389.34f, "fval is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1415,8 +1407,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_double") == true, "m_double = true expected");
dVal = newPiPtr->getDoubleField("m_double");
ASSERT(dVal == 18389.34, "dval is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1441,8 +1432,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(
genericCompare(setBoolArray, getBoolArray, getBoolArray.size()) ==
true,
"boolArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1466,8 +1456,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(
genericCompare(setByteArray, getByteArray, getByteArray.size()) ==
true,
"byteArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1491,8 +1480,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(
genericCompare(setCharArray, getCharArray, getCharArray.size()) ==
true,
"charArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1516,8 +1504,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(genericCompare(setShortArray, getShortArray, getShortArray.size())
==
true,
"shortArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1540,8 +1527,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newValArray.size() == 3, "Arraylength == 3 expected");
ASSERT(genericCompare(setIntArray, newValArray, newValArray.size()) ==
true,
"intArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1565,8 +1551,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(
genericCompare(setLongArray, getLongArray, getLongArray.size()) ==
true,
"longArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1591,8 +1576,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(genericCompare(setFloatArray, getFloatArray, getFloatArray.size())
==
true,
"floatArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1616,8 +1600,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(genericCompare(setDoubleArray, getDoubleArray,
getDoubleArray.size()) == true,
"doubleArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1649,8 +1632,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(newPiPtr->hasField("m_string") == true, "m_string = true expected");
auto stringVal = newPiPtr->getStringField("m_string");
ASSERT(stringVal == setString, "stringVal should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::shared_ptr<CacheableDate> dateVal;
wpiPtr = pIPtr->createWriter();
@@ -1665,10 +1647,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
"m_dateTime = true expected");
ASSERT(pIPtr->hasField("m_dateTime") == true, "m_date = true expected");
dateVal = newPiPtr->getCacheableDateField("m_dateTime");
- ASSERT((*(dateVal.get()) == *(datePtr.get())) == true,
- "dateObject should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*dateVal == *datePtr) == true, "dateObject should be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
try {
@@ -1887,8 +1867,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
ASSERT(setStringArray[i] == getStringArray[i],
"All stringVals should be equal");
}
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
LOGINFO("PdxInstancePtr for ParentPdx modifyPdxInstance ");
pIPtr = std::dynamic_pointer_cast<PdxInstance>(rptr->get(keyport1));
@@ -1907,19 +1886,16 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstance)
rptr->put(keyport1, wpiPtr);
newPiPtr = std::dynamic_pointer_cast<PdxInstance>(rptr->get(keyport1));
LOGINFO("ChildPdx object put get done");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
childObjPtr = newPiPtr->getCacheableField("m_childPdx");
ASSERT(childObjPtr != nullptr, "childObjPtr should not be nullptr");
LOGINFO("got childPdx field ");
auto cpi1 = std::dynamic_pointer_cast<PdxInstance>(childObjPtr);
- ASSERT((*cpi.get() == *cpi1.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*cpi == *cpi1) == false, "PdxInstance should not be equal");
auto cpo = std::dynamic_pointer_cast<ChildPdx>(cpi1->getObject());
LOGINFO("got childPdx getObject ");
- ASSERT((cpo.get()->equals(*childpdxobjPtr.get())) == true,
- "child pdx should be equal");
+ ASSERT(cpo->equals(*childpdxobjPtr) == true, "child pdx should be equal");
char16_t parentCharSetVal = 'Z';
wpiPtr = pIPtr->createWriter();
@@ -2005,8 +1981,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
newVal = newPiPtr->getIntField("m_int32");
LOGINFO("PdxInstance newVal is %d ", newVal);
ASSERT(val + 1 == newVal, "val + 1 == newVal expected");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::vector<bool> setBoolArray{true, false, true, false,
true, true, false, true};
@@ -2021,8 +1996,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
ASSERT(arrayLen == 8, "Arraylength == 8 expected");
ASSERT(genericCompare(setBoolArray, getBoolArray, arrayLen) == true,
"boolArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::vector<int8_t> setByteArray{0x34, 0x64, 0x34, 0x64};
wpiPtr->setField("m_byteArray", setByteArray);
@@ -2035,8 +2009,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
ASSERT(arrayLen == 4, "Arraylength == 4 expected");
ASSERT(genericCompare(setByteArray, getByteArray, arrayLen) == true,
"byteArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::vector<int16_t> setShortArray{0x2332, 0x4545, 0x88, 0x898};
wpiPtr->setField("m_int16Array", setShortArray);
@@ -2049,8 +2022,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
ASSERT(arrayLen == 4, "Arraylength == 4 expected");
ASSERT(genericCompare(setShortArray, getShortArray, arrayLen) == true,
"shortArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::vector<int32_t> setIntArray{23, 676868, 34343};
wpiPtr->setField("m_int32Array", setIntArray);
@@ -2063,8 +2035,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
ASSERT(arrayLen == 3, "Arraylength == 3 expected");
ASSERT(genericCompare(setIntArray, newValArray, arrayLen) == true,
"intArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::vector<int64_t> setLongArray{3245435, 3425435};
wpiPtr->setField("m_longArray", setLongArray);
@@ -2077,8 +2048,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
ASSERT(arrayLen == 2, "Arraylength == 2 expected");
ASSERT(genericCompare(setLongArray, getLongArray, arrayLen) == true,
"longArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::vector<float> setFloatArray{232.565f, 234323354.67f};
wpiPtr->setField("m_floatArray", setFloatArray);
@@ -2091,8 +2061,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
ASSERT(arrayLen == 2, "Arraylength == 2 expected");
ASSERT(genericCompare(setFloatArray, getFloatArray, arrayLen) == true,
"floatArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::vector<double> setDoubleArray{23423432.00, 43242354315.00};
wpiPtr->setField("m_doubleArray", setDoubleArray);
@@ -2105,8 +2074,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
ASSERT(arrayLen == 2, "Arraylength == 2 expected");
ASSERT(genericCompare(setDoubleArray, getDoubleArray, arrayLen) == true,
"doubleArray should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
bool boolVal = true;
wpiPtr = pIPtr->createWriter();
@@ -2120,8 +2088,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
boolVal = newPiPtr->getBooleanField("m_bool");
LOG("modifyPdxInstanceAndCheckLocally getField complete.");
ASSERT(boolVal == false, "bool is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
wpiPtr = pIPtr->createWriter();
wpiPtr->setField("m_bool", true);
@@ -2134,8 +2101,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
boolVal = newPiPtr->getBooleanField("m_bool");
LOG("modifyPdxInstanceAndCheckLocally getField complete.");
ASSERT(boolVal == true, "bool is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == true,
- "PdxInstance should be equal");
+ ASSERT((*pIPtr == *newPiPtr) == true, "PdxInstance should be equal");
float fVal = 0.0f;
wpiPtr = pIPtr->createWriter();
@@ -2150,8 +2116,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
LOGINFO("modifyPdxInstanceAndCheckLocally getField complete. fval = %f",
fVal);
ASSERT(fVal == 18389.34f, "fval is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
double dVal = 0.0;
wpiPtr = pIPtr->createWriter();
@@ -2166,8 +2131,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
LOGINFO("modifyPdxInstanceAndCheckLocally getField complete. fval = %lf",
dVal);
ASSERT(dVal == 18389.34, "fval is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
signed char byteVal = 0;
signed char setSByteVal = 0x74;
@@ -2183,8 +2147,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
LOGINFO("modifyPdxInstanceAndCheckLocally getField complete byteVal = %d ",
byteVal);
ASSERT(byteVal == setSByteVal, "byte is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == true,
- "PdxInstance should be equal");
+ ASSERT((*pIPtr == *newPiPtr) == true, "PdxInstance should be equal");
int16_t shortVal = 0;
wpiPtr = pIPtr->createWriter();
@@ -2199,8 +2162,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
LOGINFO("modifyPdxInstanceAndCheckLocally getField complete shortVal = %d
",
shortVal);
ASSERT(shortVal == 0x5678, "short is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
int64_t longVal = 0;
wpiPtr = pIPtr->createWriter();
@@ -2215,8 +2177,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
LOGINFO("modifyPdxInstanceAndCheckLocally getField complete longVal = %ld
",
longVal);
ASSERT(longVal == 0x56787878, "long is not equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::string str1 = "change the string";
wpiPtr->setField("m_string", str1);
@@ -2228,8 +2189,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
LOGINFO("modifyPdxInstanceAndCheckLocally getstringVal = %s , str1 = %s ",
getstringVal.c_str(), str1.c_str());
ASSERT(getstringVal == str1, "getstringVal should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
std::shared_ptr<CacheableDate> dateVal;
wpiPtr = pIPtr->createWriter();
@@ -2244,8 +2204,7 @@ DUNIT_TASK_DEFINITION(CLIENT2,
modifyPdxInstanceAndCheckLocally)
dateVal = newPiPtr->getCacheableDateField("m_dateTime");
ASSERT((*(dateVal.get()) == *(datePtr.get())) == true,
"dateObject should be equal");
- ASSERT((*pIPtr.get() == *newPiPtr.get()) == false,
- "PdxInstance should not be equal");
+ ASSERT((*pIPtr == *newPiPtr) == false, "PdxInstance should not be equal");
LOG("modifyPdxInstanceAndCheckLocally complete.");
}
@@ -2586,7 +2545,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, pdxInstanceWithEmptyKeys)
auto getValue = std::dynamic_pointer_cast<PdxInstance>(rptr->get(key));
LOG("get done with boolean Value and Empty Key....");
- ASSERT(*putValue.get() == *getValue.get(),
+ ASSERT(*putValue == *getValue,
"Boolean Value Did not match in case of Empty PdxField Key");
bool fieldValue = getValue->getBooleanField("");
ASSERT(fieldValue == falseValue,
diff --git a/cppcache/integration-test/testThinClientPdxTests.cpp
b/cppcache/integration-test/testThinClientPdxTests.cpp
index 9612c29..ce12ec2 100644
--- a/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -609,7 +609,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, JavaPutGet1)
auto boolPtr =
std::dynamic_pointer_cast<CacheableBoolean>(regPtr0->get("success"));
- bool isEqual = boolPtr.get()->value();
+ bool isEqual = boolPtr->value();
ASSERT(isEqual == true,
"Task JavaPutGet:Objects of type PdxType should be equal");
@@ -680,7 +680,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, JavaPutGet)
auto boolPtr =
std::dynamic_pointer_cast<CacheableBoolean>(regPtr0->get("success"));
- bool isEqual = boolPtr.get()->value();
+ bool isEqual = boolPtr->value();
LOGDEBUG("Task:JavaPutGet: isEqual = %d", isEqual);
ASSERT(isEqual == true,
"Task JavaPutGet:Objects of type PdxType should be equal");
diff --git a/cppcache/src/CacheImpl.cpp b/cppcache/src/CacheImpl.cpp
index 2336df6..cde2922 100644
--- a/cppcache/src/CacheImpl.cpp
+++ b/cppcache/src/CacheImpl.cpp
@@ -256,7 +256,7 @@ DistributedSystem& CacheImpl::getDistributedSystem() {
return m_distributedSystem;
}
-TypeRegistry& CacheImpl::getTypeRegistry() { return *m_typeRegistry.get(); }
+TypeRegistry& CacheImpl::getTypeRegistry() { return *m_typeRegistry; }
void CacheImpl::sendNotificationCloseMsgs() {
for (const auto& iter : getPoolManager().getAll()) {
diff --git a/cppcache/src/ClientProxyMembershipID.cpp
b/cppcache/src/ClientProxyMembershipID.cpp
index c3acf65..3703c9e 100644
--- a/cppcache/src/ClientProxyMembershipID.cpp
+++ b/cppcache/src/ClientProxyMembershipID.cpp
@@ -149,7 +149,8 @@ void ClientProxyMembershipID::initObjectVars(
}
writeVersion(Version::getOrdinal(), m_memID);
size_t len;
- char* buf =
reinterpret_cast<char*>(const_cast<uint8_t*>(m_memID.getBuffer(&len)));
+ char* buf =
+ reinterpret_cast<char*>(const_cast<uint8_t*>(m_memID.getBuffer(&len)));
m_memIDStr.append(buf, len);
char PID[15] = {0};
@@ -244,7 +245,7 @@ void ClientProxyMembershipID::fromData(DataInput& input) {
readVersion(splitbrain, input);
if (vmKind != ClientProxyMembershipID::LONER_DM_TYPE) {
- vmViewId = std::stoi(uniqueTag.get()->value());
+ vmViewId = std::stoi(uniqueTag->value());
initObjectVars(hostname->value().c_str(), hostAddr, len, true, hostPort,
durableClientId->value().c_str(), durableClntTimeOut,
dcport,
vPID, vmKind, splitbrain, dsName->value().c_str(), nullptr,
@@ -288,7 +289,7 @@ Serializable*
ClientProxyMembershipID::readEssentialData(DataInput& input) {
} else {
vmViewIdstr =
std::dynamic_pointer_cast<CacheableString>(input.readObject());
- vmViewId = atoi(vmViewIdstr.get()->value().c_str());
+ vmViewId = std::stoi(vmViewIdstr->value());
}
dsName = std::dynamic_pointer_cast<CacheableString>(input.readObject());
diff --git a/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
b/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
index 80c832c..9167e6e 100644
--- a/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
+++ b/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
@@ -172,9 +172,8 @@ void
InternalCacheTransactionManager2PCImpl::afterCompletion(int32_t status) {
case TcrMessage::RESPONSE: {
auto commit = std::dynamic_pointer_cast<TXCommitMessage>(
replyCommitAfter.getValue());
- if (commit.get() !=
- nullptr) // e.g. when afterCompletion(STATUS_ROLLEDBACK) called
- {
+ if (commit) {
+ // e.g. when afterCompletion(STATUS_ROLLEDBACK) called
txCleaner.clean();
commit->apply(this->getCache());
}
diff --git a/cppcache/src/LocalRegion.cpp b/cppcache/src/LocalRegion.cpp
index f9bd22e..6cc6699 100644
--- a/cppcache/src/LocalRegion.cpp
+++ b/cppcache/src/LocalRegion.cpp
@@ -1991,8 +1991,7 @@ GfErrType LocalRegion::putAllNoThrow(
"usermap");
}
- if (versionedObjPartListPtr != nullptr &&
- versionedObjPartListPtr.get() != nullptr) {
+ if (versionedObjPartListPtr) {
LOGDEBUG("versionedObjPartListPtr->getVersionedTagptr().size() = %d
",
versionedObjPartListPtr->getVersionedTagptr().size());
if (versionedObjPartListPtr->getVersionedTagptr().size() > 0) {
@@ -2030,8 +2029,7 @@ GfErrType LocalRegion::putAllNoThrow(
const auto& value = iter.second;
auto& p = oldValueMap[key];
- if (versionedObjPartListPtr != nullptr &&
- versionedObjPartListPtr.get() != nullptr) {
+ if (versionedObjPartListPtr) {
LOGDEBUG("versionedObjPartListPtr->getVersionedTagptr().size() = %d
",
versionedObjPartListPtr->getVersionedTagptr().size());
if (versionedObjPartListPtr->getVersionedTagptr().size() > 0) {
@@ -2104,8 +2102,7 @@ GfErrType LocalRegion::removeAllNoThrow(
for (size_t keyIndex = 0; keyIndex < keysPtr->size(); keyIndex++) {
auto key = keysPtr->at(keyIndex);
- if (versionedObjPartListPtr != nullptr &&
- versionedObjPartListPtr.get() != nullptr) {
+ if (versionedObjPartListPtr) {
LOGDEBUG("versionedObjPartListPtr->getVersionedTagptr().size() = %d ",
versionedObjPartListPtr->getVersionedTagptr().size());
if (versionedObjPartListPtr->getVersionedTagptr().size() > 0) {
diff --git a/cppcache/src/MapSegment.cpp b/cppcache/src/MapSegment.cpp
index b67eef0..41fb743 100644
--- a/cppcache/src/MapSegment.cpp
+++ b/cppcache/src/MapSegment.cpp
@@ -34,8 +34,6 @@ namespace apache {
namespace geode {
namespace client {
-#define _VERSION_TAG_NULL_CHK \
- (versionTag != nullptr && versionTag.get() != nullptr)
bool MapSegment::boolVal = false;
MapSegment::~MapSegment() {
delete m_map;
@@ -101,7 +99,7 @@ GfErrType MapSegment::create(const
std::shared_ptr<CacheableKey>& key,
VersionStamp versionStamp;
if (m_concurrencyChecksEnabled) {
versionStamp = entry->getVersionStamp();
- if (_VERSION_TAG_NULL_CHK) {
+ if (versionTag) {
err = versionStamp.processVersionTag(m_region, key, versionTag,
false);
if (err != GF_NOERR) return err;
@@ -172,7 +170,7 @@ GfErrType MapSegment::put(const
std::shared_ptr<CacheableKey>& key,
VersionStamp versionStamp;
if (m_concurrencyChecksEnabled) {
versionStamp = entry->getVersionStamp();
- if (_VERSION_TAG_NULL_CHK) {
+ if (versionTag) {
if (delta == nullptr) {
err = versionStamp.processVersionTag(m_region, key, versionTag,
false);
@@ -220,7 +218,7 @@ GfErrType MapSegment::invalidate(const
std::shared_ptr<CacheableKey>& key,
VersionStamp versionStamp;
if (m_concurrencyChecksEnabled) {
versionStamp = entry->getVersionStamp();
- if (_VERSION_TAG_NULL_CHK) {
+ if (versionTag) {
err = versionStamp.processVersionTag(m_region, key, versionTag, false);
if (err != GF_NOERR) return err;
versionStamp.setVersions(versionTag);
@@ -269,7 +267,7 @@ GfErrType MapSegment::removeWhenConcurrencyEnabled(
// If the version tag is null, use the version tag of
// the existing entry
versionStamp = entry->getVersionStamp();
- if (_VERSION_TAG_NULL_CHK) {
+ if (versionTag) {
std::shared_ptr<CacheableKey> keyPtr;
entry->getImplPtr()->getKeyI(keyPtr);
if ((err = entry->getVersionStamp().processVersionTag(
@@ -303,7 +301,7 @@ GfErrType MapSegment::removeWhenConcurrencyEnabled(
// If entry not found than add a tombstone for this entry
// so that any future updates for this entry are checked for version
// no entry
- if (_VERSION_TAG_NULL_CHK) {
+ if (versionTag) {
std::shared_ptr<MapEntryImpl> mapEntry;
putNoEntry(key, CacheableToken::tombstone(), mapEntry, -1, 0,
versionTag);
m_tombstoneList->add(mapEntry->getImplPtr(), handler, expiryTaskID);
@@ -649,7 +647,8 @@ GfErrType MapSegment::putForTrackedEntry(
auto* thinClientRegion = dynamic_cast<ThinClientRegion*>(m_region);
ThinClientPoolDM* m_poolDM = nullptr;
if (thinClientRegion) {
- m_poolDM =
dynamic_cast<ThinClientPoolDM*>(thinClientRegion->getDistMgr());
+ m_poolDM =
+ dynamic_cast<ThinClientPoolDM*>(thinClientRegion->getDistMgr());
}
if (delta != nullptr) {
diff --git a/cppcache/src/MapSegment.hpp b/cppcache/src/MapSegment.hpp
index d102ea1..e756798 100644
--- a/cppcache/src/MapSegment.hpp
+++ b/cppcache/src/MapSegment.hpp
@@ -174,7 +174,7 @@ class APACHE_GEODE_EXPORT MapSegment {
m_entryFactory->newMapEntry(m_expiryTaskManager, key, newEntry);
newEntry->setValueI(newValue);
if (m_concurrencyChecksEnabled) {
- if (versionTag != nullptr && versionTag.get() != nullptr) {
+ if (versionTag) {
newEntry->getVersionStamp().setVersions(versionTag);
} else if (versionStamp != nullptr) {
newEntry->getVersionStamp().setVersions(*versionStamp);
diff --git a/cppcache/src/Pool.cpp b/cppcache/src/Pool.cpp
index b873090..a0caca3 100644
--- a/cppcache/src/Pool.cpp
+++ b/cppcache/src/Pool.cpp
@@ -109,9 +109,8 @@ AuthenticatedView Pool::createAuthenticatedView(
throw IllegalStateException("cache has been closed. ");
}
- if (credentials != nullptr && credentials.get() == nullptr) {
+ if (!credentials) {
LOGDEBUG("Pool::createSecureUserCache creds are null");
- credentials = nullptr;
}
return AuthenticatedView(credentials, shared_from_this(), cacheImpl);
diff --git a/cppcache/src/ThinClientRegion.cpp
b/cppcache/src/ThinClientRegion.cpp
index 12011d9..74c467a 100644
--- a/cppcache/src/ThinClientRegion.cpp
+++ b/cppcache/src/ThinClientRegion.cpp
@@ -97,7 +97,7 @@ class PutAllWork : public PooledWork<GfErrType>,
{
m_request = new TcrMessagePutAll(
new DataOutput(m_region->getCache().createDataOutput()),
m_region.get(),
- *m_map.get(), m_timeout, m_poolDM, aCallbackArgument);
+ *m_map, m_timeout, m_poolDM, aCallbackArgument);
m_reply = new TcrMessageReply(true, m_poolDM);
// create new instanceof VCOPL
@@ -867,9 +867,9 @@ void ThinClientRegion::clear(
/** @brief Create message and send to bridge server */
- TcrMessageClearRegion request(
- new DataOutput(m_cacheImpl->createDataOutput()), this, aCallbackArgument,
- std::chrono::milliseconds(-1), m_tcrdm);
+ TcrMessageClearRegion request(new
DataOutput(m_cacheImpl->createDataOutput()),
+ this, aCallbackArgument,
+ std::chrono::milliseconds(-1), m_tcrdm);
TcrMessageReply reply(true, m_tcrdm);
err = m_tcrdm->sendSyncRequest(request, reply);
if (err != GF_NOERR) GfErrTypeToException("Region::clear", err);
@@ -1545,7 +1545,7 @@ GfErrType ThinClientRegion::singleHopPutAllNoThrow_remote(
std::shared_ptr<VersionedCacheableObjectPartList> vcopListPtr;
GfErrType errCode = multiHopPutAllNoThrow_remote(
- *newSubMap.get(), vcopListPtr, timeout, aCallbackArgument);
+ *newSubMap, vcopListPtr, timeout, aCallbackArgument);
if (errCode == GF_NOERR) {
result->addKeysAndVersions(vcopListPtr);
} else if (errCode == GF_PUTALL_PARTIAL_RESULT_EXCEPTION) {
@@ -3338,9 +3338,10 @@ void ChunkedInterestResponse::handleChunk(const uint8_t*
chunk,
uint32_t partLen;
if (TcrMessageHelper::readChunkPartHeader(
- m_msg, input, DSCode::FixedIDDefault,
static_cast<int32_t>(DSCode::CacheableArrayList),
- "ChunkedInterestResponse", partLen,
- isLastChunkWithSecurity) !=
TcrMessageHelper::ChunkObjectType::OBJECT) {
+ m_msg, input, DSCode::FixedIDDefault,
+ static_cast<int32_t>(DSCode::CacheableArrayList),
+ "ChunkedInterestResponse", partLen, isLastChunkWithSecurity) !=
+ TcrMessageHelper::ChunkObjectType::OBJECT) {
// encountered an exception part, so return without reading more
m_replyMsg.readSecureObjectPart(input, false, true,
isLastChunkWithSecurity);
@@ -3369,9 +3370,10 @@ void ChunkedKeySetResponse::handleChunk(const uint8_t*
chunk, int32_t chunkLen,
uint32_t partLen;
if (TcrMessageHelper::readChunkPartHeader(
- m_msg, input, DSCode::FixedIDDefault,
static_cast<int32_t>(DSCode::CacheableArrayList),
- "ChunkedKeySetResponse", partLen,
- isLastChunkWithSecurity) !=
TcrMessageHelper::ChunkObjectType::OBJECT) {
+ m_msg, input, DSCode::FixedIDDefault,
+ static_cast<int32_t>(DSCode::CacheableArrayList),
+ "ChunkedKeySetResponse", partLen, isLastChunkWithSecurity) !=
+ TcrMessageHelper::ChunkObjectType::OBJECT) {
// encountered an exception part, so return without reading more
m_replyMsg.readSecureObjectPart(input, false, true,
isLastChunkWithSecurity);
@@ -3423,7 +3425,8 @@ void ChunkedQueryResponse::readObjectPartList(DataInput&
input,
readObjectPartList(input, true);
} else {
LOGERROR(
- "Query response got unhandled message format %" PRId8 "while
expecting "
+ "Query response got unhandled message format %" PRId8
+ "while expecting "
"struct set object part list; possible serialization mismatch",
code);
throw MessageException(
@@ -3436,16 +3439,17 @@ void
ChunkedQueryResponse::readObjectPartList(DataInput& input,
}
void ChunkedQueryResponse::handleChunk(const uint8_t* chunk, int32_t chunkLen,
- uint8_t isLastChunkWithSecurity,
- const CacheImpl* cacheImpl) {
+ uint8_t isLastChunkWithSecurity,
+ const CacheImpl* cacheImpl) {
LOGDEBUG("ChunkedQueryResponse::handleChunk..");
auto input = cacheImpl->createDataInput(chunk, chunkLen, m_msg.getPool());
uint32_t partLen;
- TcrMessageHelper::ChunkObjectType objType =
TcrMessageHelper::readChunkPartHeader(
- m_msg, input, DSCode::FixedIDByte,
- static_cast<int32_t>(DSFid::CollectionTypeImpl),
- "ChunkedQueryResponse" , partLen, isLastChunkWithSecurity);
+ TcrMessageHelper::ChunkObjectType objType =
+ TcrMessageHelper::readChunkPartHeader(
+ m_msg, input, DSCode::FixedIDByte,
+ static_cast<int32_t>(DSFid::CollectionTypeImpl),
+ "ChunkedQueryResponse", partLen, isLastChunkWithSecurity);
if (objType == TcrMessageHelper::ChunkObjectType::EXCEPTION) {
// encountered an exception part, so return without reading more
m_msg.readSecureObjectPart(input, false, true, isLastChunkWithSecurity);
@@ -3534,7 +3538,8 @@ void ChunkedQueryResponse::handleChunk(const uint8_t*
chunk, int32_t chunkLen,
}
} else if (arrayType == DSCode::FixedIDByte) {
arrayType = static_cast<DSCode>(input.read());
- if (static_cast<int32_t>(arrayType) !=
static_cast<int32_t>(DSFid::CacheableObjectPartList)) {
+ if (static_cast<int32_t>(arrayType) !=
+ static_cast<int32_t>(DSFid::CacheableObjectPartList)) {
LOGERROR(
"Query response got unhandled message format %d while expecting "
"object part list; possible serialization mismatch",
@@ -3585,8 +3590,9 @@ void ChunkedFunctionExecutionResponse::handleChunk(
TcrMessageHelper::ChunkObjectType arrayType;
if ((arrayType = TcrMessageHelper::readChunkPartHeader(
- m_msg, input, "ChunkedFunctionExecutionResponse", partLen,
- isLastChunkWithSecurity)) ==
TcrMessageHelper::ChunkObjectType::EXCEPTION) {
+ m_msg, input, "ChunkedFunctionExecutionResponse", partLen,
+ isLastChunkWithSecurity)) ==
+ TcrMessageHelper::ChunkObjectType::EXCEPTION) {
// encountered an exception part, so return without reading more
m_msg.readSecureObjectPart(input, false, true, isLastChunkWithSecurity);
return;
@@ -3689,7 +3695,7 @@ void ChunkedFunctionExecutionResponse::handleChunk(
} else {
result = value;
}
- if (m_resultCollectorLock.get() != nullptr) {
+ if (m_resultCollectorLock) {
ACE_Guard<ACE_Recursive_Thread_Mutex> guard(*m_resultCollectorLock);
m_rc->addResult(result);
} else {
@@ -3717,8 +3723,9 @@ void ChunkedGetAllResponse::handleChunk(const uint8_t*
chunk, int32_t chunkLen,
uint32_t partLen;
if (TcrMessageHelper::readChunkPartHeader(
m_msg, input, DSCode::FixedIDByte,
- static_cast<int32_t>(DSFid::VersionedObjectPartList),
"ChunkedGetAllResponse",
- partLen, isLastChunkWithSecurity) !=
TcrMessageHelper::ChunkObjectType::OBJECT) {
+ static_cast<int32_t>(DSFid::VersionedObjectPartList),
+ "ChunkedGetAllResponse", partLen, isLastChunkWithSecurity) !=
+ TcrMessageHelper::ChunkObjectType::OBJECT) {
// encountered an exception part, so return without reading more
m_msg.readSecureObjectPart(input, false, true, isLastChunkWithSecurity);
return;
@@ -3771,9 +3778,9 @@ void ChunkedPutAllResponse::handleChunk(const uint8_t*
chunk, int32_t chunkLen,
uint32_t partLen;
TcrMessageHelper::ChunkObjectType chunkType;
if ((chunkType = TcrMessageHelper::readChunkPartHeader(
- m_msg, input, DSCode::FixedIDByte,
- static_cast<int32_t>(DSFid::VersionedObjectPartList),
- "ChunkedPutAllResponse", partLen, isLastChunkWithSecurity)) ==
+ m_msg, input, DSCode::FixedIDByte,
+ static_cast<int32_t>(DSFid::VersionedObjectPartList),
+ "ChunkedPutAllResponse", partLen, isLastChunkWithSecurity)) ==
TcrMessageHelper::ChunkObjectType::NULL_OBJECT) {
LOGDEBUG("ChunkedPutAllResponse::handleChunk nullptr object");
// No issues it will be empty in case of disabled caching.
@@ -3829,9 +3836,9 @@ void ChunkedRemoveAllResponse::handleChunk(const uint8_t*
chunk,
uint32_t partLen;
TcrMessageHelper::ChunkObjectType chunkType;
if ((chunkType = TcrMessageHelper::readChunkPartHeader(
- m_msg, input, DSCode::FixedIDByte,
- static_cast<int32_t>(DSFid::VersionedObjectPartList),
- "ChunkedRemoveAllResponse", partLen, isLastChunkWithSecurity))
==
+ m_msg, input, DSCode::FixedIDByte,
+ static_cast<int32_t>(DSFid::VersionedObjectPartList),
+ "ChunkedRemoveAllResponse", partLen, isLastChunkWithSecurity)) ==
TcrMessageHelper::ChunkObjectType::NULL_OBJECT) {
LOGDEBUG("ChunkedRemoveAllResponse::handleChunk nullptr object");
// No issues it will be empty in case of disabled caching.
