GEODE-9346: When client received incorrect byte array of PdxType due … (

apache#6561)
WeijieEST · Jul 9, 2021 · 11e4c3a · 11e4c3a
1 parent 6ba9a82
commit 11e4c3a
Show file tree

Hide file tree

Showing 5 changed files with 442 additions and 46 deletions.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.geode.LogWriter;
 import org.apache.geode.cache.AttributesFactory;
@@ -82,7 +83,7 @@ public final void preTearDownCacheTestCase() throws Exception {
     preTearDownPDXQueryTestBase();
     disconnectAllFromDS(); // tests all expect to create a new ds
     // Reset the testObject numinstance for the next test.
-    TestObject.numInstance = 0;
+    TestObject.numInstance.set(0);
     // In all VM.
     resetTestObjectInstanceCount();
   }
@@ -96,11 +97,11 @@ private void resetTestObjectInstanceCount() {
       vm.invoke(new CacheSerializableRunnable("Create cache server") {
         @Override
         public void run2() throws CacheException {
-          TestObject.numInstance = 0;
+          TestObject.numInstance.set(0);
           PortfolioPdx.numInstance = 0;
           PositionPdx.numInstance = 0;
           PositionPdx.cnt = 0;
-          TestObject2.numInstance = 0;
+          TestObject2.numInstance.set(0);
         }
       });
     }
@@ -306,15 +307,15 @@ protected void startCacheServer(int port, boolean notifyBySubscription) throws I
 
   public static class TestObject2 implements PdxSerializable {
     public int _id;
-    public static int numInstance = 0;
+    public static AtomicInteger numInstance = new AtomicInteger();
 
     public TestObject2() {
-      numInstance++;
+      numInstance.incrementAndGet();
     }
 
     public TestObject2(int id) {
       this._id = id;
-      numInstance++;
+      numInstance.incrementAndGet();
     }
 
     public int getId() {
@@ -359,7 +360,7 @@ public static class TestObject implements PdxSerializable {
     public int important;
     public int selection;
     public int select;
-    public static int numInstance = 0;
+    public static final AtomicInteger numInstance = new AtomicInteger();
     public Map idTickers = new HashMap();
     public HashMap positions = new HashMap();
     public TestObject2 test;
@@ -368,7 +369,7 @@ public TestObject() {
       if (log != null) {
         log.info("TestObject ctor stack trace", new Exception());
       }
-      numInstance++;
+      numInstance.incrementAndGet();
     }
 
     public TestObject(int id, String ticker) {
@@ -381,7 +382,7 @@ public TestObject(int id, String ticker) {
       this.important = id;
       this.selection = id;
       this.select = id;
-      numInstance++;
+      numInstance.incrementAndGet();
       idTickers.put(id + "", ticker);
       this.test = new TestObject2(id);
     }

diff --git a/...e/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java b/...e/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
@@ -899,7 +899,7 @@ public void run2() throws CacheException {
   protected final void preTearDownPDXQueryTestBase() throws Exception {
     disconnectAllFromDS(); // tests all expect to create a new ds
     // Reset the testObject numinstance for the next test.
-    TestObject.numInstance = 0;
+    TestObject.numInstance.set(0);
     PortfolioPdx.DEBUG = false;
     // In all VM.
     resetTestObjectInstanceCount();
@@ -917,11 +917,11 @@ private void resetTestObjectInstanceCount() {
       vm.invoke(new CacheSerializableRunnable("Create cache server") {
         @Override
         public void run2() throws CacheException {
-          TestObject.numInstance = 0;
+          TestObject.numInstance.set(0);
           PortfolioPdx.numInstance = 0;
           PositionPdx.numInstance = 0;
           PositionPdx.cnt = 0;
-          TestObject2.numInstance = 0;
+          TestObject2.numInstance.set(0);
         }
       });
     }