You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/03/10 18:47:14 UTC
[2/4] incubator-geode git commit: GEODE-1063 Now during cacheClose we
CacheCloseException..
GEODE-1063 Now during cacheClose we CacheCloseException..
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b91a22be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b91a22be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b91a22be
Branch: refs/heads/develop
Commit: b91a22bece37dd670be742e2891fcd05f3bb91b3
Parents: 5fcf037
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Wed Mar 9 12:19:36 2016 -0800
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Thu Mar 10 09:47:24 2016 -0800
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/internal/cache/LocalRegion.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b91a22be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 830d47d..c727a53 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -10366,7 +10366,10 @@ public class LocalRegion extends AbstractRegion
txException = txException.getCause();
}
if (e == null) {
- e = new ServerOperationException(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(getFullPath()), e1.getFailure());
+ e = getCancelCriterion().generateCancelledException(e1.getFailure());//for cache close
+ if(e == null) {
+ e = new ServerOperationException(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(getFullPath()), e1.getFailure());
+ }
}
}
}