You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2021/11/09 01:01:00 UTC

[geode] branch feature/GEODE-9747 created (now 1f49a58)

This is an automated email from the ASF dual-hosted git repository.

zhouxj pushed a change to branch feature/GEODE-9747
in repository https://gitbox.apache.org/repos/asf/geode.git.


      at 1f49a58  GEODE-9747: add expected DistributedSystemDisconnectedException to the test

This branch includes the following new commits:

     new 1f49a58  GEODE-9747: add expected DistributedSystemDisconnectedException to the test

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[geode] 01/01: GEODE-9747: add expected DistributedSystemDisconnectedException to the test

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhouxj pushed a commit to branch feature/GEODE-9747
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 1f49a587d0b22ee18342b4840739806a8e5db73c
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Mon Nov 8 16:59:08 2021 -0800

    GEODE-9747: add expected DistributedSystemDisconnectedException to the test
---
 .../partitioned/PersistentPartitionedRegionDistributedTest.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index a58faf4..7ca095c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -1681,8 +1681,9 @@ public class PersistentPartitionedRegionDistributedTest implements Serializable
 
   private boolean thrownByDiskRecoveryDueToConflictingPersistentDataException(
       Throwable expectedException) {
-    return expectedException instanceof CacheClosedException
-        && expectedException.getCause() instanceof ConflictingPersistentDataException;
+    return expectedException instanceof DistributedSystemDisconnectedException
+        || (expectedException instanceof CacheClosedException
+            && expectedException.getCause() instanceof ConflictingPersistentDataException);
   }
 
   private boolean thrownByAsyncFlusherThreadDueToConflictingPersistentDataException(