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/08/01 21:47:33 UTC
[geode] branch feature/GEODE-5515 updated: fix a review comment.
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch feature/GEODE-5515
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5515 by this push:
new ab8be62 fix a review comment.
ab8be62 is described below
commit ab8be627ae595efe5d4027286b1e2ee4527a66e1
Author: eshu <es...@pivotal.io>
AuthorDate: Wed Aug 1 14:47:12 2018 -0700
fix a review comment.
---
.../java/org/apache/geode/internal/cache/PausedTXStateProxyImpl.java | 4 ++++
.../src/main/java/org/apache/geode/internal/cache/TXState.java | 2 +-
.../src/main/java/org/apache/geode/internal/cache/TXStateProxy.java | 2 ++
.../main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java | 5 +++++
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PausedTXStateProxyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PausedTXStateProxyImpl.java
index 2e52551..743780c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PausedTXStateProxyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PausedTXStateProxyImpl.java
@@ -410,4 +410,8 @@ public class PausedTXStateProxyImpl implements TXStateProxy {
@Override
public void updateProxyServer(InternalDistributedMember proxy) {}
+ @Override
+ public InternalDistributedMember getOnBehalfOfClientMember() {
+ return null;
+ }
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
index 3515313..9494fd3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -1939,7 +1939,7 @@ public class TXState implements TXStateInterface {
// During set operations we need to forward it to other nodes to avoid
// wrong transaction is masqueraded if the transaction is on behalf of a client.
// This needs to be set to the clients member id if the client originated the tx.
- return ((TXStateProxyImpl) proxy).onBehalfOfClientMember;
+ return proxy.getOnBehalfOfClientMember();
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
index 7a79914..25d1b24 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
@@ -83,4 +83,6 @@ public interface TXStateProxy extends TXStateInterface {
void setInProgress(boolean progress);
void updateProxyServer(InternalDistributedMember proxy);
+
+ InternalDistributedMember getOnBehalfOfClientMember();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
index dc82fce..005ae1e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
@@ -979,4 +979,9 @@ public class TXStateProxyImpl implements TXStateProxy {
this.lastOperationTimeFromClient = lastOperationTimeFromClient;
}
+ @Override
+ public InternalDistributedMember getOnBehalfOfClientMember() {
+ return onBehalfOfClientMember;
+ }
+
}