[geode] 03/05: GEODE-5405: Use zero as default revokedTime in PersistentMemberPattern

[kl...@apache.org]

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

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

commit 5cd4e055476430db8bbda8822fdda37ee85a43c9
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Thu Jul 12 16:58:28 2018 -0700

    GEODE-5405: Use zero as default revokedTime in PersistentMemberPattern
    
    Different code paths were using different default. One was zero while
    another was -1. This prevent comparisons including collection contains
    operations.
---
 .../geode/internal/cache/persistence/PersistentMemberPattern.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java
index b24d0a0..360934d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java
@@ -39,11 +39,11 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist
   protected long revokedTime;
 
   public PersistentMemberPattern(PersistentMemberID id) {
-    this(id.host, id.directory, id.diskStoreId.toUUID(), -1);
+    this(id.host, id.directory, id.diskStoreId.toUUID(), 0);
   }
 
   public PersistentMemberPattern(InetAddress host, String directory) {
-    this(host, directory, null, -1);
+    this(host, directory, null, 0);
   }
 
   public PersistentMemberPattern(InetAddress host, String directory, long revokedTime) {
@@ -51,7 +51,7 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist
   }
 
   public PersistentMemberPattern(UUID id) {
-    this(null, null, id, -1);
+    this(null, null, id, 0);
   }
 
   public PersistentMemberPattern(InetAddress host, String directory, UUID diskStoreID,
@@ -96,6 +96,7 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist
       result.append(SocketCreator.getHostName(host));
       result.append(":");
       result.append(directory);
+      result.append(",revokedTime").append(revokedTime);
       result.append("]");
     }