You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ja...@apache.org on 2017/05/13 00:35:44 UTC
[02/26] geode git commit: GEODE-236: fix javadoc warnings
GEODE-236: fix javadoc warnings
Also removed two implementations of the deprecated
methods that had been removed.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/250c8189
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/250c8189
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/250c8189
Branch: refs/heads/feature/GEODE-2900
Commit: 250c818940ad9fa1c773ce17c85bf021111388d2
Parents: d58be4f
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue May 9 11:40:31 2017 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue May 9 11:40:31 2017 -0700
----------------------------------------------------------------------
.../geode/internal/cache/DistributedRegion.java | 9 +++++----
.../apache/geode/internal/cache/RegionEventImpl.java | 14 --------------
2 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/250c8189/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 839cc98..322e29c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -1706,7 +1706,8 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
@Override
void basicInvalidateRegion(RegionEventImpl event) {
// disallow local invalidation for replicated regions
- if (!event.isDistributed() && getScope().isDistributed() && getDataPolicy().withReplication()) {
+ if (!event.getOperation().isDistributed() && getScope().isDistributed()
+ && getDataPolicy().withReplication()) {
throw new IllegalStateException(
LocalizedStrings.DistributedRegion_NOT_ALLOWED_TO_DO_A_LOCAL_INVALIDATION_ON_A_REPLICATED_REGION
.toLocalizedString());
@@ -1725,7 +1726,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
* @return true if {@link InvalidateRegionOperation} should be distributed, false otherwise
*/
protected boolean shouldDistributeInvalidateRegion(RegionEventImpl event) {
- return event.isDistributed() && !event.isOriginRemote();
+ return event.getOperation().isDistributed() && !event.isOriginRemote();
}
/**
@@ -1960,7 +1961,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
try {
obtainWriteLocksForClear(regionEvent, participants);
clearRegionLocally(regionEvent, cacheWrite, null);
- if (!regionEvent.isOriginRemote() && regionEvent.isDistributed()) {
+ if (!regionEvent.isOriginRemote() && regionEvent.getOperation().isDistributed()) {
DistributedClearOperation.clear(regionEvent, null, participants);
}
} finally {
@@ -1973,7 +1974,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
Set<InternalDistributedMember> participants =
getCacheDistributionAdvisor().adviseInvalidateRegion();
clearRegionLocally(regionEvent, cacheWrite, null);
- if (!regionEvent.isOriginRemote() && regionEvent.isDistributed()) {
+ if (!regionEvent.isOriginRemote() && regionEvent.getOperation().isDistributed()) {
DistributedClearOperation.clear(regionEvent, null, participants);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/250c8189/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
index 6bbc281..651ce9b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
@@ -187,20 +187,6 @@ public class RegionEventImpl
return true;
}
- /**
- * @see org.apache.geode.cache.CacheEvent#isExpiration()
- */
- public boolean isExpiration() {
- return this.op.isExpiration();
- }
-
- /**
- * @see org.apache.geode.cache.CacheEvent#isDistributed()
- */
- public boolean isDistributed() {
- return this.op.isDistributed();
- }
-
@Override
public Object clone() {
try {