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. CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ddefa3fa
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ddefa3fa
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ddefa3fa

Branch: refs/heads/TINKERPOP-1379
Commit: ddefa3fa060cc460f758ff949b087ec8d3d19c34
Parents: 6be2827
Author: Stephen Mallette <[email protected]>
Authored: Tue Jul 26 11:01:02 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Tue Jul 26 11:01:02 2016 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddefa3fa/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 20ba1ff..5b1a90b 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -389,7 +389,7 @@ public abstract class AbstractEvalOpProcessor 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;
                     }
 

Reply via email to