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/10 04:31:22 UTC

[geode] branch develop updated: GEODE-9747: add expected DistributedSystemDisconnectedException to the test (#7093)

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

zhouxj pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 917b83d  GEODE-9747: add expected DistributedSystemDisconnectedException to the test (#7093)
917b83d is described below

commit 917b83d5b4549827eb316f17604816b139c6f584
Author: Xiaojian Zhou <ge...@users.noreply.github.com>
AuthorDate: Tue Nov 9 20:30:10 2021 -0800

    GEODE-9747: add expected DistributedSystemDisconnectedException to the test (#7093)
---
 .../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(