You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/05/23 22:16:37 UTC
[2/3] incubator-geode git commit: now calls txMgr.removeHostedTXState
unconditionally
now calls txMgr.removeHostedTXState unconditionally
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/03a81fca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/03a81fca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/03a81fca
Branch: refs/heads/feature/GEODE-1426
Commit: 03a81fcacc512ac1ff786c53209d15a0a3816010
Parents: 53c9454
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon May 23 14:36:03 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon May 23 14:36:03 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/TXRemoteCommitMessage.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03a81fca/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
index 03361d5..bdf6a23 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
@@ -85,7 +85,6 @@ public class TXRemoteCommitMessage extends TXMessage {
logger.debug("TX: Committing: {}", txId);
}
final TXStateProxy txState = txMgr.getTXState();
- boolean commitSuccessful = false;
TXCommitMessage cmsg = null;
try {
// do the actual commit, only if it was not done before
@@ -97,21 +96,17 @@ public class TXRemoteCommitMessage extends TXMessage {
if (txMgr.isExceptionToken(cmsg)) {
throw txMgr.getExceptionForToken(cmsg, txId);
}
- commitSuccessful = true;
} else {
// if no TXState was created (e.g. due to only getEntry/size operations
// that don't start remote TX) then ignore
if (txState != null) {
txState.setCommitOnBehalfOfRemoteStub(true);
txMgr.commit();
- commitSuccessful = true;
cmsg = txState.getCommitMessage();
}
}
} finally {
- if (commitSuccessful) {
- txMgr.removeHostedTXState(txId);
- }
+ txMgr.removeHostedTXState(txId);
}
TXRemoteCommitReplyMessage.send(getSender(), getProcessorId(), cmsg, getReplySender(dm));