Repository: geode-native
Updated Branches:
  refs/heads/develop 5b1634a34 -> da389793e


http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/fwklib/FwkObjects.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkObjects.hpp 
b/src/tests/cpp/fwklib/FwkObjects.hpp
index 6068616..b8a3793 100644
--- a/src/tests/cpp/fwklib/FwkObjects.hpp
+++ b/src/tests/cpp/fwklib/FwkObjects.hpp
@@ -21,14 +21,15 @@
  */
 
 /**
-  * @file    FwkObjects.hpp
-  * @since   1.0
-  * @version 1.0
-  * @see
-  */
+ * @file    FwkObjects.hpp
+ * @since   1.0
+ * @version 1.0
+ * @see
+ */
 
 // ----------------------------------------------------------------------------
 
+#include <geode/Cache.hpp>
 #include <geode/Properties.hpp>
 #include <geode/ExpirationAction.hpp>
 #include <geode/RegionAttributes.hpp>
@@ -124,10 +125,10 @@ class FwkObject {
 // ----------------------------------------------------------------------------
 
 /**
-  * @class TFwkSet
-  *
-  * @brief Framework base data object set template
-  */
+ * @class TFwkSet
+ *
+ * @brief Framework base data object set template
+ */
 
 template <class FWK_OBJECT>
 class TFwkSet {
@@ -157,8 +158,8 @@ class TFwkSet {
   }
 
   /** @brief Find a object in collection
-    * @param key Object key to find
-    */
+   * @param key Object key to find
+   */
   const FWK_OBJECT* find(const std::string& key) const {
     const FWK_OBJECT* obj = NULL;
     int32_t pos = findIdx(key);
@@ -209,8 +210,8 @@ class TFwkSet {
   }
 
   /** @brief Add an object
-    * @param obj Object to add
-    */
+   * @param obj Object to add
+   */
   void add(const FWK_OBJECT* obj) {
     if (obj != NULL) {
       m_vec.push_back(obj);
@@ -251,9 +252,9 @@ typedef std::vector<std::string> StringVector;
 // ----------------------------------------------------------------------------
 
 /** @class XMLStringConverter
-  * @brief  This is a simple class that lets us do easy (though not
-  * terribly efficient) trancoding of char* data to XMLCh data.
-  */
+ * @brief  This is a simple class that lets us do easy (though not
+ * terribly efficient) trancoding of char* data to XMLCh data.
+ */
 class XMLStringConverter {
  public:
   XMLStringConverter(const char* const toTranscode) {
@@ -492,6 +493,8 @@ class FwkRegion {
 
 class FwkPool {
   std::string m_name;
+  CachePtr m_cache;
+  PoolManager* m_poolManager;
   PoolFactoryPtr m_poolFactory;
   bool m_locators;
   bool m_servers;
@@ -600,16 +603,17 @@ class FwkPool {
     }
   }
 
-  PoolPtr createPoolForPerf() { return m_poolFactory->create(m_name.c_str()); }
+  //  PoolPtr createPoolForPerf() { return
+  //  m_poolFactory->create(m_name.c_str()); }
 
-  PoolPtr createPool() const {
-    if (m_name.empty()) {
-      FWKEXCEPTION("Pool name not specified.");
-    } else {
-      return m_poolFactory->create(m_name.c_str());
-    }
-    return nullptr;
-  }
+  //  PoolPtr createPool() const {
+  //    if (m_name.empty()) {
+  //      FWKEXCEPTION("Pool name not specified.");
+  //    } else {
+  //      return m_poolFactory->create(m_name.c_str());
+  //    }
+  //    return nullptr;
+  //  }
   const std::string& getName() const { return m_name; }
   void print() const { FWKINFO("FwkPool " << m_name); }
 };
@@ -899,11 +903,11 @@ class FwkData : public FwkObject {
 // ----------------------------------------------------------------------------
 
 /**
-  * @class FwkDataSet
-  *
-  * @brief Container to hold FwkData objects
-  * @see FwkData
-  */
+ * @class FwkDataSet
+ *
+ * @brief Container to hold FwkData objects
+ * @see FwkData
+ */
 class FwkDataSet : public TFwkSet<FwkData> {
  public:
   FwkDataSet() {}
@@ -913,10 +917,10 @@ class FwkDataSet : public TFwkSet<FwkData> {
 // ----------------------------------------------------------------------------
 
 /**
-  * @class FwkClient
-  *
-  * @brief FwkClient object
-  */
+ * @class FwkClient
+ *
+ * @brief FwkClient object
+ */
 class FwkClient : public FwkObject {
  public:
   FwkClient(const DOMNode* node);
@@ -973,11 +977,11 @@ class FwkClient : public FwkObject {
 // ----------------------------------------------------------------------------
 
 /**
-  * @class FwkClientSet
-  *
-  * @brief Container to hold FwkClient objects
-  * @see FwkClient
-  */
+ * @class FwkClientSet
+ *
+ * @brief Container to hold FwkClient objects
+ * @see FwkClient
+ */
 class FwkClientSet : public TFwkSet<FwkClient> {
   bool m_exclude;
   int32_t m_count;
@@ -1030,10 +1034,10 @@ typedef std::list<uint32_t> TaskClientIdxList;
 class FwkTest;
 
 /**
-  * @class FwkTask
-  *
-  * @brief FwkTask object
-  */
+ * @class FwkTask
+ *
+ * @brief FwkTask object
+ */
 class FwkTask : public FwkObject {
  public:
   FwkTask(const DOMNode* node);
@@ -1201,8 +1205,8 @@ class FwkTask : public FwkObject {
   }
 
   /** @brief Add ClientSet
-    * @param set ClientSet to add
-    */
+   * @param set ClientSet to add
+   */
   void addClientSet(FwkClientSet* set) {
     const FwkClient* client = set->getFirst();
     while (client != NULL) {
@@ -1253,21 +1257,21 @@ class FwkTask : public FwkObject {
 // ----------------------------------------------------------------------------
 
 /**
-* @class FwkTaskSet
-*
-* @brief Container to hold FwkTask objects
-* @see FwkTask
-*/
+ * @class FwkTaskSet
+ *
+ * @brief Container to hold FwkTask objects
+ * @see FwkTask
+ */
 class FwkTaskSet : public TFwkSet<FwkTask> {};
 
 // ----------------------------------------------------------------------------
 class TestDriver;
 
 /**
-  * @class FwkTest
-  *
-  * @brief FwkTest object
-  */
+ * @class FwkTest
+ *
+ * @brief FwkTest object
+ */
 class FwkTest : public FwkObject {
  public:
   FwkTest(const DOMNode* node);
@@ -1355,11 +1359,11 @@ class FwkTest : public FwkObject {
 // ----------------------------------------------------------------------------
 
 /**
-* @class FwkTestSet
-*
-* @brief Container to hold FwkTest objects
-* @see FwkTest
-*/
+ * @class FwkTestSet
+ *
+ * @brief Container to hold FwkTest objects
+ * @see FwkTest
+ */
 class FwkTestSet : public TFwkSet<FwkTest> {};
 
 // ----------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/fwklib/PoolHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PoolHelper.hpp 
b/src/tests/cpp/fwklib/PoolHelper.hpp
index 2d7d1a4..f397992 100644
--- a/src/tests/cpp/fwklib/PoolHelper.hpp
+++ b/src/tests/cpp/fwklib/PoolHelper.hpp
@@ -40,9 +40,9 @@ namespace testframework {
 // ----------------------------------------------------------------------------
 
 /** @class PoolHelper
-  * @brief Class used to define a valid combination of attributes and
-  * specifications for a pool.
-  */
+ * @brief Class used to define a valid combination of attributes and
+ * specifications for a pool.
+ */
 class PoolHelper {
   const FwkPool* m_pool;
   std::string m_spec;
@@ -128,7 +128,7 @@ class PoolHelper {
 
   PoolPtr createPool() {
     const char* poolName = m_pool->getName().c_str();
-    PoolPtr pptr = PoolManager::find(poolName);
+    PoolPtr pptr = m_pool->m_poolManager.find(poolName);
     if (pptr == nullptr) {
       pptr = m_pool->createPool();
     }
@@ -143,9 +143,9 @@ class PoolHelper {
 };
 
 }  // namespace testframework
-}
-}
-}
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 // ----------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/fwklib/QueryHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/QueryHelper.hpp 
b/src/tests/cpp/fwklib/QueryHelper.hpp
index ecf6c1c..c509bdc 100644
--- a/src/tests/cpp/fwklib/QueryHelper.hpp
+++ b/src/tests/cpp/fwklib/QueryHelper.hpp
@@ -36,7 +36,8 @@
 
 #include <geode/ResultSet.hpp>
 #include <geode/StructSet.hpp>
-
+#include "SerializationRegistry.hpp"
+#include "DataOutputInternal.hpp"
 #ifndef ROOT_SCOPE
 #define ROOT_SCOPE LOCAL
 #endif
@@ -806,7 +807,7 @@ bool QueryHelper::compareTwoPositionObjects(SerializablePtr 
pos1,
     return false;
   }
 
-  DataOutput o1, o2;
+  DataOutputInternal o1, o2;
   p1->toData(o1);
   p2->toData(o2);
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/security/PkcsAuthInit.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsAuthInit.cpp 
b/src/tests/cpp/security/PkcsAuthInit.cpp
index f77de9b..f17b59e 100644
--- a/src/tests/cpp/security/PkcsAuthInit.cpp
+++ b/src/tests/cpp/security/PkcsAuthInit.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+#include "SerializationRegistry.hpp"
 #include "PkcsAuthInit.hpp"
 #include <geode/Properties.hpp>
 #include <geode/CacheableBuiltins.hpp>
@@ -109,8 +109,8 @@ static bool s_initDone = openSSLInit();
 }
 // end of extern "C"
 
-PropertiesPtr PKCSAuthInitInternal::getCredentials(PropertiesPtr& 
securityprops,
-                                                   const char* server) {
+PropertiesPtr PKCSAuthInitInternal::getCredentials(
+    const PropertiesPtr& securityprops, const char* server) {
   if (!s_initDone) {
     throw AuthenticationFailedException(
         "PKCSAuthInit::getCredentials: "
@@ -151,7 +151,6 @@ PropertiesPtr 
PKCSAuthInitInternal::getCredentials(PropertiesPtr& securityprops,
         "PKCSAuthInit::getCredentials: "
         "key-store password property KEYSTORE_PASSWORD not set.");
   }
-  DataOutput additionalMsg;
 
   FILE* keyStoreFP = fopen(keyStorePath, "r");
   if (keyStoreFP == NULL) {
@@ -176,17 +175,10 @@ PropertiesPtr 
PKCSAuthInitInternal::getCredentials(PropertiesPtr& securityprops,
   }
 
   fclose(keyStoreFP);
-
-  additionalMsg.writeUTF(alias);
-
-  uint32_t dataLen;
-  char* data = (char*)additionalMsg.getBuffer(&dataLen);
   unsigned int lengthEncryptedData = 0;
 
-  // Skip first two bytes of the java UTF-8 encoded string
-  // containing the length of the string.
   uint8_t* signatureData = createSignature(
-      privateKey, cert, reinterpret_cast<unsigned char*>(data + 2), dataLen - 
2,
+      privateKey, cert, reinterpret_cast<const unsigned char*>(alias), 
strlen(alias),
       &lengthEncryptedData);
   EVP_PKEY_free(privateKey);
   X509_free(cert);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/security/PkcsAuthInit.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsAuthInit.hpp 
b/src/tests/cpp/security/PkcsAuthInit.hpp
index 6649bfa..e094b1b 100644
--- a/src/tests/cpp/security/PkcsAuthInit.hpp
+++ b/src/tests/cpp/security/PkcsAuthInit.hpp
@@ -88,7 +88,7 @@ class PKCSAuthInitInternal : public AuthInitialize {
    * The format expected is "host:port".
    * @returns the credentials to be used for the given <code>server</code>
    */
-  PropertiesPtr getCredentials(PropertiesPtr& securityprops,
+  PropertiesPtr getCredentials(const PropertiesPtr& securityprops,
                                const char* server);
 
   /**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/ArrayOfByte.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/ArrayOfByte.hpp 
b/src/tests/cpp/testobject/ArrayOfByte.hpp
index 58fe730..a898468 100644
--- a/src/tests/cpp/testobject/ArrayOfByte.hpp
+++ b/src/tests/cpp/testobject/ArrayOfByte.hpp
@@ -26,6 +26,10 @@
 #include "fwklib/FrameworkTest.hpp"
 #include <ace/Time_Value.h>
 
+#include "SerializationRegistry.hpp"
+#include "DataInputInternal.hpp"
+#include "DataOutputInternal.hpp"
+
 #ifdef _WIN32
 #ifdef BUILD_TESTOBJECT
 #define TESTOBJECT_EXPORT LIBEXP
@@ -46,7 +50,7 @@ class TESTOBJECT_EXPORT ArrayOfByte {
   static CacheableBytesPtr init(int size, bool encodeKey,
                                 bool encodeTimestamp) {
     if (encodeKey) {
-      DataOutput dos;
+      DataOutputInternal dos;
       try {
         int32_t index = 1234;
         dos.writeInt(index);
@@ -76,12 +80,13 @@ class TESTOBJECT_EXPORT ArrayOfByte {
     }
   }
 
-  static int64_t getTimestamp(CacheableBytesPtr bytes) {
+  static int64_t getTimestamp(CacheableBytesPtr bytes,
+                              SerializationRegistry &serializationRegistry) {
     if (bytes == nullptr) {
       throw apache::geode::client::IllegalArgumentException(
           "the bytes arg was null");
     }
-    DataInput di(bytes->value(), bytes->length());
+    DataInputInternal di(bytes->value(), bytes->length(), nullptr);
     try {
       int32_t index;
       di.readInt(&index);
@@ -96,8 +101,9 @@ class TESTOBJECT_EXPORT ArrayOfByte {
     }
   }
 
-  static void resetTimestamp(CacheableBytesPtr bytes) {
-    DataInput di(bytes->value(), bytes->length());
+  static void resetTimestamp(CacheableBytesPtr bytes,
+                             SerializationRegistry &serializationRegistry) {
+    DataInputInternal di(bytes->value(), bytes->length(), nullptr);
     int32_t index;
     try {
       di.readInt(&index);
@@ -109,7 +115,7 @@ class TESTOBJECT_EXPORT ArrayOfByte {
     } catch (Exception &e) {
       FWKEXCEPTION("Unable to read from stream " << e.getMessage());
     }
-    DataOutput dos;
+    DataOutputInternal dos;
     try {
       dos.writeInt(index);
       ACE_Time_Value startTime;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp 
b/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp
index 3094b2d..8530b63 100644
--- a/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp
+++ b/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp
@@ -23,7 +23,7 @@ using namespace testobject;
 DeltaFastAssetAccount::DeltaFastAssetAccount(int index, bool encodeTimestp,
                                              int maxVal, int asstSize,
                                              bool getbfrUpdate)
-    : encodeTimestamp(encodeTimestp), acctId(index) {
+    : Delta(nullptr), encodeTimestamp(encodeTimestp), acctId(index) {
   customerName = CacheableString::create("Milton Moneybags");
   netWorth = 0.0;
   assets = CacheableHashMap::create();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp 
b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
index e08e6b3..f27cb09 100644
--- a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
+++ b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
@@ -63,7 +63,8 @@ class TESTOBJECT_EXPORT DeltaFastAssetAccount : public 
Cacheable, public Delta {
 
  public:
   DeltaFastAssetAccount()
-      : encodeTimestamp(0),
+      : Delta(nullptr),
+        encodeTimestamp(0),
         acctId(0),
         customerName(nullptr),
         netWorth(0.0),

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/DeltaPSTObject.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaPSTObject.cpp 
b/src/tests/cpp/testobject/DeltaPSTObject.cpp
index 4f3dfdc..94246e6 100644
--- a/src/tests/cpp/testobject/DeltaPSTObject.cpp
+++ b/src/tests/cpp/testobject/DeltaPSTObject.cpp
@@ -22,7 +22,8 @@ using namespace apache::geode::client;
 using namespace testframework;
 using namespace testobject;
 
-DeltaPSTObject::DeltaPSTObject(int size, bool encodeKey, bool encodeTimestamp) 
{
+DeltaPSTObject::DeltaPSTObject(int size, bool encodeKey, bool encodeTimestamp)
+    : Delta(nullptr) {
   ACE_Time_Value startTime;
   startTime = ACE_OS::gettimeofday();
   ACE_UINT64 tusec = 0;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/DeltaPSTObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaPSTObject.hpp 
b/src/tests/cpp/testobject/DeltaPSTObject.hpp
index b06cee3..2b581a1 100644
--- a/src/tests/cpp/testobject/DeltaPSTObject.hpp
+++ b/src/tests/cpp/testobject/DeltaPSTObject.hpp
@@ -59,7 +59,7 @@ class TESTOBJECT_EXPORT DeltaPSTObject : public Cacheable, 
public Delta {
   }
 
  public:
-  DeltaPSTObject() : timestamp(0), valueData(nullptr) {}
+  DeltaPSTObject() : Delta(nullptr), timestamp(0), valueData(nullptr) {}
   DeltaPSTObject(int size, bool encodeKey, bool encodeTimestamp);
   virtual ~DeltaPSTObject() {}
   void toData(apache::geode::client::DataOutput& output) const;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/DeltaTestImpl.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaTestImpl.cpp 
b/src/tests/cpp/testobject/DeltaTestImpl.cpp
index 43ddd7c..f77bdcc 100644
--- a/src/tests/cpp/testobject/DeltaTestImpl.cpp
+++ b/src/tests/cpp/testobject/DeltaTestImpl.cpp
@@ -31,7 +31,7 @@ uint8_t DeltaTestImpl::BYTE_ARR_MASK = 0x8;
 uint8_t DeltaTestImpl::TEST_OBJ_MASK = 0x10;
 uint8_t DeltaTestImpl::COMPLETE_MASK = 0x1F;
 
-DeltaTestImpl::DeltaTestImpl() {
+DeltaTestImpl::DeltaTestImpl() : Delta(nullptr) {
   intVar = 1;
   str = CacheableString::create("test");
   doubleVar = 1.1;
@@ -44,18 +44,20 @@ DeltaTestImpl::DeltaTestImpl() {
   fromDeltaCounter = 0;
 }
 DeltaTestImpl::DeltaTestImpl(int intValue, CacheableStringPtr strptr)
-    : intVar(intValue),
+    : Delta(nullptr),
+      intVar(intValue),
       str(strptr),
       doubleVar(0),
       toDeltaCounter(0),
       fromDeltaCounter(0) {}
-DeltaTestImpl::DeltaTestImpl(DeltaTestImplPtr rhs) {
+DeltaTestImpl::DeltaTestImpl(DeltaTestImplPtr rhs) : Delta(nullptr) {
   intVar = rhs->intVar;
   str = CacheableString::create(rhs->str->asChar());
   doubleVar = rhs->doubleVar;
-  byteArr = (rhs->byteArr == nullptr ? nullptr : CacheableBytes::create(
-                                                     rhs->byteArr->value(),
-                                                     rhs->byteArr->length()));
+  byteArr = (rhs->byteArr == nullptr
+                 ? nullptr
+                 : CacheableBytes::create(rhs->byteArr->value(),
+                                          rhs->byteArr->length()));
   testObj = (rhs->testObj == nullptr
                  ? nullptr
                  : TestObject1Ptr(new TestObject1(*(rhs->testObj.get()))));

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/NonPdxType.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/NonPdxType.hpp 
b/src/tests/cpp/testobject/NonPdxType.hpp
index b7f5989..2641870 100644
--- a/src/tests/cpp/testobject/NonPdxType.hpp
+++ b/src/tests/cpp/testobject/NonPdxType.hpp
@@ -27,7 +27,7 @@
  */
 
 #include <geode/GeodeCppCache.hpp>
-
+#include "SerializationRegistry.hpp"
 #ifdef _WIN32
 #ifdef BUILD_TESTOBJECT
 #define TESTOBJECT_EXPORT LIBEXP
@@ -163,7 +163,7 @@ class TESTOBJECT_EXPORT NonPdxType {
  public:
   bool selfCheck();
 
-  inline void init() {
+  inline void init(PdxSerializerPtr pdxSerializer) {
     m_char = 'C';
     m_bool = true;
     m_byte = 0x74;
@@ -300,27 +300,36 @@ class TESTOBJECT_EXPORT NonPdxType {
     m_add[9] = new NonPdxAddress(10, "street9", "city9");
 
     m_objectArray = CacheableObjectArray::create();
-
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(1, "street0", "city0"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(2, "street1", "city1"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(3, "street2", "city2"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(4, "street3", "city3"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(5, "street4", "city4"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(6, "street5", "city5"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(7, "street6", "city6"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(8, "street7", "city7"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(9, "street8", "city8"), "PdxTests.Address")));
-    m_objectArray->push_back(PdxWrapperPtr(new PdxWrapper(
-        new NonPdxAddress(10, "street9", "city9"), "PdxTests.Address")));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(1, "street0", "city0"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(2, "street1", "city1"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(3, "street2", "city2"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(4, "street3", "city3"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(5, "street4", "city4"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(6, "street5", "city5"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(7, "street6", "city6"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(8, "street7", "city7"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(9, "street8", "city8"),
+                                     "PdxTests.Address", pdxSerializer)));
+    m_objectArray->push_back(
+        PdxWrapperPtr(new PdxWrapper(new NonPdxAddress(10, "street9", "city9"),
+                                     "PdxTests.Address", pdxSerializer)));
 
     m_byte252 = new int8_t[252];
     for (int i = 0; i < 252; i++) {
@@ -359,7 +368,7 @@ class TESTOBJECT_EXPORT NonPdxType {
     lengthArr[1] = 2;
   }
 
-  NonPdxType() { init(); }
+  NonPdxType(PdxSerializerPtr pdxSerializer) { init(pdxSerializer); }
 
   inline bool compareBool(bool b, bool b2) {
     if (b == b2) return b;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/NoopAuthInit.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/NoopAuthInit.cpp 
b/src/tests/cpp/testobject/NoopAuthInit.cpp
index b502894..94704c8 100644
--- a/src/tests/cpp/testobject/NoopAuthInit.cpp
+++ b/src/tests/cpp/testobject/NoopAuthInit.cpp
@@ -31,7 +31,7 @@ LIBEXP AuthInitialize* createNoopAuthInitInstance() {
 }
 }
 
-PropertiesPtr NoopAuthInit::getCredentials(PropertiesPtr& securityprops,
+PropertiesPtr NoopAuthInit::getCredentials(const PropertiesPtr& securityprops,
                                            const char* server) {
   LOGINFO("rjk: calling NoopAuthInit::getCredentials");
   PropertiesPtr credentials = Properties::create();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/tests/cpp/testobject/NoopAuthInit.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/NoopAuthInit.hpp 
b/src/tests/cpp/testobject/NoopAuthInit.hpp
index e5a996c..cf3c240 100644
--- a/src/tests/cpp/testobject/NoopAuthInit.hpp
+++ b/src/tests/cpp/testobject/NoopAuthInit.hpp
@@ -68,7 +68,7 @@ class NoopAuthInit : public AuthInitialize {
    * @remarks This method can modify the given set of properties. For
    * example it may invoke external agents or even interact with the user.
    */
-  PropertiesPtr getCredentials(PropertiesPtr& securityprops,
+  PropertiesPtr getCredentials(const PropertiesPtr& securityprops,
                                const char* server);
 
   /**

Reply via email to