You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2017/06/06 22:53:58 UTC

geode git commit: removed delimiter from getName

Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-3027 e402ef8a2 -> c1cb17576


removed delimiter from getName


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c1cb1757
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c1cb1757
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c1cb1757

Branch: refs/heads/feature/GEODE-3027
Commit: c1cb1757666aa972ff010240f518be966a42a694
Parents: e402ef8
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jun 6 11:53:00 2017 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jun 6 11:53:00 2017 -0700

----------------------------------------------------------------------
 .../geode/cache/partition/StringPrefixPartitionResolver.java     | 4 ++--
 .../cache/partition/StringPrefixPartitionResolverJUnitTest.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/c1cb1757/geode-core/src/main/java/org/apache/geode/cache/partition/StringPrefixPartitionResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/StringPrefixPartitionResolver.java b/geode-core/src/main/java/org/apache/geode/cache/partition/StringPrefixPartitionResolver.java
index d00a2f5..2bc52b4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/StringPrefixPartitionResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/StringPrefixPartitionResolver.java
@@ -57,7 +57,7 @@ public class StringPrefixPartitionResolver implements PartitionResolver<String,
 
   @Override
   public java.lang.String getName() {
-    return getClass().getName() + getDelimiter();
+    return getClass().getName();
   }
 
   private java.lang.String getDelimiter() {
@@ -78,7 +78,7 @@ public class StringPrefixPartitionResolver implements PartitionResolver<String,
       return false;
     }
     StringPrefixPartitionResolver other = (StringPrefixPartitionResolver) o;
-    return other.getName().equals(getName());
+    return other.getName().equals(getName()) && other.getDelimiter().equals(getDelimiter());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/geode/blob/c1cb1757/geode-core/src/test/java/org/apache/geode/cache/partition/StringPrefixPartitionResolverJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/partition/StringPrefixPartitionResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/partition/StringPrefixPartitionResolverJUnitTest.java
index 7bcb4e9..b8d97a3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/partition/StringPrefixPartitionResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/partition/StringPrefixPartitionResolverJUnitTest.java
@@ -31,7 +31,7 @@ public class StringPrefixPartitionResolverJUnitTest {
 
   @Test
   public void testGetName() {
-    assertEquals("org.apache.geode.cache.partition.StringPrefixPartitionResolver" + DELIMITER,
+    assertEquals("org.apache.geode.cache.partition.StringPrefixPartitionResolver",
         (new StringPrefixPartitionResolver()).getName());
   }