Merge branch '3.3' into 3.4

neo4j · Mar 28, 2018 · 6e4a4c0 · 6e4a4c0
2 parents adf3045 + 97eb6fc
commit 6e4a4c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/...y/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandleRegistry.java b/...y/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandleRegistry.java
@@ -126,7 +126,7 @@ boolean isSuspended()
             return true;
         }
 
-        public long getLastActiveTimestamp()
+        long getLastActiveTimestamp()
         {
             return lastActiveTimestamp;
         }
@@ -225,21 +225,23 @@ public TransactionHandle terminate( long id ) throws TransactionLifecycleExcepti
         {
             throw new InvalidTransactionId();
         }
-        else
-        {
-            TransactionTerminationHandle handle = marker.getActiveTransaction().getTerminationHandle();
-            handle.terminate();
 
-            try
-            {
-                return acquire( id );
-            }
-            catch ( InvalidConcurrentTransactionAccess exception )
+        TransactionTerminationHandle handle = marker.getActiveTransaction().getTerminationHandle();
+        handle.terminate();
+
+        try
+        {
+            SuspendedTransaction transaction = marker.getSuspendedTransaction();
+            if ( registry.replace( id, marker, marker.getActiveTransaction() ) )
             {
-                // We could not acquire the transaction. Let the other request clean up.
-                return null;
+                return transaction.transactionHandle;
             }
         }
+        catch ( InvalidConcurrentTransactionAccess exception )
+        {
+            // We could not acquire the transaction. Let the other request clean up.
+        }
+        return null;
     }
 
     @Override

diff --git a/...y/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionIT.java b/...y/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionIT.java
@@ -608,7 +608,6 @@ public void begin__execute__rollback_concurrently() throws Exception
                                                                         statement + "' } ] }" ) );
             assertThat( response.status(), equalTo( 200 ) );
             return response;
-
         } );
 
         // terminate