fix lock finally (#82)

Project.toml

@@ -1,7 +1,7 @@
 name = "UnROOT"
 uuid = "3cd96dde-e98d-4713-81e9-a4a1b0235ce9"
 authors = ["Tamas Gal", "Jerry Ling", "Johannes Schumann", "Nick Amin"]
-version = "0.4.0"
+version = "0.4.1"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/root.jl

@@ -419,36 +419,40 @@ function readbasketseek(
 f::ROOTFile, branch::Union{TBranch, TBranchElement}, seek_pos::Int
 )::Tuple{Vector{UInt8},Vector{Int32}}  # just being extra careful
     lock(f)
-    seek(f.fobj, seek_pos)
-    basketkey = unpack(f.fobj, TBasketKey)
-    compressedbytes = compressed_datastream(f.fobj, basketkey)
-    unlock(f)
-
-    basketrawbytes = decompress_datastreambytes(compressedbytes, basketkey)
-
-    @debug begin
-        ibasket = findfirst(==(seek_pos), branch.fBasketSeek)
-        mbcompressed = length(compressedbytes)/1024^2
-        mbuncompressed = length(basketrawbytes)/1024^2
-        "Read branch $(branch.fName), basket $(ibasket), $(mbcompressed) MB compressed, $(mbuncompressed) MB uncompressed"
-    end
+    try
+        seek(f.fobj, seek_pos)
+        basketkey = unpack(f.fobj, TBasketKey)
+        compressedbytes = compressed_datastream(f.fobj, basketkey)
 
-    Keylen = basketkey.fKeylen
-    contentsize = Int32(basketkey.fLast - Keylen)
+        basketrawbytes = decompress_datastreambytes(compressedbytes, basketkey)
 
-    offsetbytesize = basketkey.fObjlen - contentsize - 8
+        @debug begin
+            ibasket = findfirst(==(seek_pos), branch.fBasketSeek)
+            mbcompressed = length(compressedbytes)/1024^2
+            mbuncompressed = length(basketrawbytes)/1024^2
+            "Read branch $(branch.fName), basket $(ibasket), $(mbcompressed) MB compressed, $(mbuncompressed) MB uncompressed"
+        end
 
-    data = @view basketrawbytes[1:contentsize]
-    if offsetbytesize > 0
+        Keylen = basketkey.fKeylen
+        contentsize = Int32(basketkey.fLast - Keylen)
 
-        #indexing is inclusive on both ends
-        offbytes = @view basketrawbytes[(contentsize + 4 + 1):(end - 4)]
+        offsetbytesize = basketkey.fObjlen - contentsize - 8
 
-        # offsets starts at -fKeylen, same as the `local_offset` we pass in in the loop
-        offset = ntoh.(reinterpret(Int32, offbytes)) .- Keylen
-        push!(offset, contentsize)
-        data, offset
-    else
-        data, Int32[]
+        data = @view basketrawbytes[1:contentsize]
+        if offsetbytesize > 0
+
+            #indexing is inclusive on both ends
+            offbytes = @view basketrawbytes[(contentsize + 4 + 1):(end - 4)]
+
+            # offsets starts at -fKeylen, same as the `local_offset` we pass in in the loop
+            offset = ntoh.(reinterpret(Int32, offbytes)) .- Keylen
+            push!(offset, contentsize)
+            return data, offset
+        else
+            return data, Int32[]
+        end
+    catch
+        finally
+        unlock(f)
     end
 end