This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEM-883
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEM-883 by this push:
new fa343e1 GEODE-3967: notifyTimestampsToGateways should inherit
isConcurrencyConflict
fa343e1 is described below
commit fa343e1138f7468e1d63cc58621cd7cdd9b1bae1
Author: zhouxh <[email protected]>
AuthorDate: Mon Nov 20 17:47:13 2017 -0800
GEODE-3967: notifyTimestampsToGateways should inherit isConcurrencyConflict
---
.../src/main/java/org/apache/geode/internal/cache/LocalRegion.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 158ff68..7af6b4e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -5855,6 +5855,9 @@ public class LocalRegion extends AbstractRegion
implements InternalRegion, Loade
updateTimeStampEvent.setGenerateCallbacks(false);
updateTimeStampEvent.distributedMember = event.getDistributedMember();
updateTimeStampEvent.setNewEventId(getSystem());
+ if (event.isConcurrencyConflict()) {
+ updateTimeStampEvent.isConcurrencyConflict(true);
+ }
if (event.getRegion() instanceof BucketRegion) {
BucketRegion bucketRegion = (BucketRegion) event.getRegion();
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
