Fixed transaction management check during result iteration If there was an error during creation of a Frame the transaction management check was not taking into account overrides during sessionless requests. This change was originally made in tp31 but couldn't merge directly very well due to refactoring in master. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2f2b3731 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2f2b3731 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2f2b3731 Branch: refs/heads/master Commit: 2f2b3731b952143dcf66022603b1c9f464dfbc1c Parents: ac382c5 Author: Stephen Mallette <[email protected]> Authored: Tue Jul 26 11:25:48 2016 -0400 Committer: Stephen Mallette <[email protected]> Committed: Tue Jul 26 11:25:48 2016 -0400 ---------------------------------------------------------------------- .../apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2f2b3731/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java index 4b10bbe..3a090f1 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java @@ -138,7 +138,7 @@ public abstract class AbstractOpProcessor implements OpProcessor { // exception is handled in makeFrame() - serialization error gets written back to driver // at that point - if (manageTransactions) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement); + if (managedTransactionsForRequest) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement); break; }
