You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by la...@apache.org on 2017/04/29 00:12:42 UTC
[12/18] geode git commit: GEODE-2632: make
GemFireCacheImpl.getRegion(String) non-final
GEODE-2632: make GemFireCacheImpl.getRegion(String) non-final
* mock getRegion(String) in ParallelQueueRemovalMessageJUnitTest
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bcb8a746
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bcb8a746
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bcb8a746
Branch: refs/heads/feature/GEODE-2852
Commit: bcb8a746dbd8f6344da362821fb28958bb33bb61
Parents: 63ffe76
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Apr 26 11:16:57 2017 -0700
Committer: Lynn Hughes-Godfrey <lh...@pivotal.io>
Committed: Fri Apr 28 17:06:33 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 5 +----
.../wan/parallel/ParallelQueueRemovalMessageJUnitTest.java | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/bcb8a746/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index de7558c..a181054 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -3162,11 +3162,8 @@ public class GemFireCacheImpl
}
}
- /**
- * TODO: any changes to this method breaks ParallelQueueRemovalMessageJUnitTest
- */
@Override
- public final Region getRegion(String path) {
+ public Region getRegion(String path) {
return getRegion(path, false);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bcb8a746/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index b7ee5c8..1221b6e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -121,7 +121,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
.thenReturn(Region.SEPARATOR + PartitionedRegionHelper.PR_ROOT_REGION_NAME);
when(this.cache.getRegion(PartitionedRegionHelper.PR_ROOT_REGION_NAME, true))
.thenReturn(this.rootRegion);
- when(this.cache.getRegion(getRegionQueueName(), false)).thenReturn(this.queueRegion);
+ when(this.cache.getRegion(getRegionQueueName())).thenReturn(this.queueRegion);
}
private void createBucketRegionQueue() {