Fixed bug on index closing

orientechnologies · Jun 19, 2013 · c510987 · c510987
1 parent 04fc345
commit c510987
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreePersistent.java b/core/src/main/java/com/orientechnologies/orient/core/type/tree/OMVRBTreePersistent.java
@@ -256,9 +256,14 @@ public void unload() {
       root = null;
 
       final ODatabaseRecord db = ODatabaseRecordThreadLocal.INSTANCE.getIfDefined();
-      if (db != null && !db.isClosed())
+      if (db != null && !db.isClosed()) {
         // RELOAD IT
-        load();
+        try {
+          load();
+        } catch (Exception e) {
+          // IGNORE IT
+        }
+      }
 
     } catch (Exception e) {
       OLogManager.instance().error(this, "Error on unload the tree: " + dataProvider, e, OStorageException.class);

diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/GraphDatabaseTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/GraphDatabaseTest.java
@@ -535,8 +535,8 @@ public void testexpandBlankDatabase() throws IOException {
     database.removeVertex(playerDoc);
     database.removeVertex(teamDoc);
 
-    ODatabaseHelper.deleteDatabase(database);
     database.close();
+    ODatabaseHelper.deleteDatabase(database);
   }
 
   //