neo4j-core 5.1.7 → 5.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 270806b67718b4b05e99c73d1b1d2118fefe6dce
-  data.tar.gz: 878b8d073dd7a1fbce2139524a92f195286325f4
+  metadata.gz: f4f8a3a2a56fcb350b9dec6bed3c00561af9a66b
+  data.tar.gz: a8e483897c5de8b8a2f59f3050ee64bf2802064e
 SHA512:
-  metadata.gz: d4f9e836e2a5352c48621ef7bc0bfe40f6ec6cab15fcc7b32a003e719a11211d78e35c247ea2e51fc1c50926babe3215285a054541e511483ab9d72bfdae2707
-  data.tar.gz: fea94937e02b32ffdd8bf6a5bbf8bee6f9e7ac6b56b1cab031ec9c5c918a03bcca21df1b2e87e5edb4b5f7c837fbca30e99b088d6981dd82352f9fc2717411fd
+  metadata.gz: d344cf40505f38c5ecc76a5b80951b22bc5ff3945518c7316f93d4be1e99079bc78735d50a1899ced572a20ddbe729cc54c7c80eba94020733f5bde2e7ac99d7
+  data.tar.gz: e90b752dadb1a5dcfc6cb4334acf0826cce0d46aa55675e1a91f0a4350b869411c79e9f0ee510a7e31826782012e7aab038bcbb0b080234edce020e770d1350c

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.1.7'
+    VERSION = '5.1.10'
   end
 end

data/lib/neo4j-server/cypher_transaction.rb

@@ -73,12 +73,17 @@ module Neo4j
             cypher_response.set_data(first_result)
           else
             first_error = response.body[:errors].first
-            mark_expired if first_error[:message].match(/Unrecognized transaction id/)
+            tx_cleanup!(first_error)
             cypher_response.set_error(first_error)
           end
         end
       end
 
+      def tx_cleanup!(first_error)
+        autoclosed!
+        mark_expired if first_error[:message].match(/Unrecognized transaction id/)
+      end
+
       def empty_response
         OpenStruct.new(status: 200, body: '')
       end

data/lib/neo4j/transaction.rb

@@ -21,6 +21,18 @@ module Neo4j
       end
       alias_method :failure?, :failed?
 
+      def autoclosed!
+        @autoclosed = true if transient_failures_autoclose?
+      end
+
+      def transient_failures_autoclose?
+        Neo4j::Session.current.version >= '2.2.6'
+      end
+
+      def autoclosed?
+        !!@autoclosed
+      end
+
       def mark_expired
         @expired = true
       end
@@ -61,7 +73,18 @@ module Neo4j
         return if @pushed_nested >= 0
         fail "Can't commit transaction, already committed" if @pushed_nested < -1
         Neo4j::Transaction.unregister(self)
-        failed? ? delete : commit
+        post_close!
+      end
+
+      private
+
+      def post_close!
+        return if autoclosed?
+        if failed?
+          delete
+        else
+          commit
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.1.10
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty