You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by es...@apache.org on 2018/01/13 00:52:53 UTC
[geode] 02/02: GEODE-4200: handle cache is null case.
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch feature/GEODE-3583-storage
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4b8d22a5cfe97a6fb68bf4f0c6ca281c6b848591
Author: eshu <es...@pivotal.io>
AuthorDate: Fri Jan 12 16:49:02 2018 -0800
GEODE-4200: handle cache is null case.
---
.../org/apache/geode/internal/cache/CacheDistributionAdvisor.java | 3 ++-
.../java/org/apache/geode/internal/cache/InitialImageOperation.java | 6 ++++--
.../main/java/org/apache/geode/internal/cache/TXCommitMessage.java | 5 +++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
index f4872dc..a188750 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
@@ -752,7 +752,8 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
LocalRegion lclRgn;
int oldLevel = LocalRegion.setThreadInitLevelRequirement(LocalRegion.ANY_INIT);
try {
- lclRgn = dm.getCache().getRegionByPath(adviseePath);
+ InternalCache cache = dm.getCache();
+ lclRgn = cache == null ? null : cache.getRegionByPath(adviseePath);
} finally {
LocalRegion.setThreadInitLevelRequirement(oldLevel);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index 8ae830b..84d633d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -1478,7 +1478,8 @@ public class InitialImageOperation {
logger.debug("RequestImageMessage: attempting to get region reference for {}, initLevel={}",
regionPath, initLevel);
}
- lclRgn = dm.getCache().getRegionByPath(regionPath);
+ InternalCache cache = dm.getCache();
+ lclRgn = cache == null ? null : cache.getRegionByPath(regionPath);
// if this is a targeted getInitialImage after a region was initialized,
// make sure this is the region that was reinitialized.
if (lclRgn != null && !lclRgn.isUsedForPartitionedRegionBucket() && targetReinitialized
@@ -2234,7 +2235,8 @@ public class InitialImageOperation {
ReplyException rex = null;
try {
Assert.assertTrue(this.regionPath != null, "Region path is null.");
- lclRgn = dm.getCache().getRegionByPath(regionPath);
+ InternalCache cache = dm.getCache();
+ lclRgn = cache == null ? null : cache.getRegionByPath(regionPath);
if (lclRgn == null) {
if (logger.isDebugEnabled()) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
index fd8b7ca..4a74abf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -1187,7 +1187,8 @@ public class TXCommitMessage extends PooledDistributionMessage
}
LocalRegion getRegionByPath(DistributionManager dm, String regionPath) {
- return dm.getCache().getRegionByPath(regionPath);
+ InternalCache cache = dm.getCache();
+ return cache == null ? null : cache.getRegionByPath(regionPath);
}
/**
@@ -1359,7 +1360,7 @@ public class TXCommitMessage extends PooledDistributionMessage
public boolean isForceFireEvent(DistributionManager dm) {
- LocalRegion r = dm.getCache().getRegionByPath(regionPath);
+ LocalRegion r = getRegionByPath(dm, regionPath);
if (r instanceof PartitionedRegion || (r != null && r.isUsedForPartitionedRegionBucket())) {
return false;
}
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.