commit ed88dc5a03134b19a87d695b7e0d7a1e6c999f97
author salsubaiee <salsubaiee@123451ca-8445-de46-9d55-352943316053> Mon Jan 30 21:07:32 2012 +0000
committer salsubaiee <salsubaiee@123451ca-8445-de46-9d55-352943316053> Mon Jan 30 21:07:32 2012 +0000
tree 4fb251c8283d62a921ea4a7ecf9306a3d0d21e83
parent 7b5eb1b891cfe5aa572ef0d26357906508a4e7c8

Fixed the order of closing and deleting a tree during the cleanup of a merge.

git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_lsm_tree@1100 123451ca-8445-de46-9d55-352943316053

hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMTree.java

diff --git a/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMTree.java b/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMTree.java
index a0fd1f6..ca780b7 100644
--- a/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMTree.java
+++ b/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMTree.java
@@ -119,10 +119,9 @@
 
     protected void cleanupTrees(List<ITreeIndex> mergingDiskTrees) throws HyracksDataException {
         for (ITreeIndex oldTree : mergingDiskTrees) {
-            oldTree.close();
             FileReference fileRef = diskFileMapProvider.lookupFileName(oldTree.getFileId());
             diskBufferCache.closeFile(oldTree.getFileId());
-            diskBufferCache.deleteFile(oldTree.getFileId());
+            oldTree.close();
             fileRef.getFile().delete();
         }
     }