fixed deadlock on restoring and index with server security, issue #7489

orientechnologies · Jul 6, 2017 · c2252d1 · c2252d1
1 parent 48e68c6
commit c2252d1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/OrientDBEmbedded.java b/core/src/main/java/com/orientechnologies/orient/core/db/OrientDBEmbedded.java
@@ -104,8 +104,8 @@ public ODatabaseDocumentEmbedded openNoAuthenticate(String name, String user) {
         // THIS OPEN THE STORAGE ONLY THE FIRST TIME
         storage.open(config.getConfigurations());
         embedded = factory.newInstance(storage);
-        embedded.internalOpen(user, "nopwd", config, false);
       }
+      embedded.internalOpen(user, "nopwd", config, false);
       embedded.callOnOpenListeners();
       return embedded;
     } catch (Exception e) {
@@ -124,8 +124,8 @@ public ODatabaseDocumentInternal open(String name, String user, String password,
         // THIS OPEN THE STORAGE ONLY THE FIRST TIME
         storage.open(config.getConfigurations());
         embedded = factory.newInstance(storage);
-        embedded.internalOpen(user, password, config);
       }
+      embedded.internalOpen(user, password, config);
       embedded.callOnOpenListeners();
       return embedded;
     } catch (Exception e) {
@@ -152,8 +152,8 @@ public ODatabaseDocumentInternal poolOpen(String name, String user, String passw
       OAbstractPaginatedStorage storage = getOrInitStorage(name);
       storage.open(pool.getConfig().getConfigurations());
       embedded = factory.newPoolInstance(pool, storage);
-      embedded.internalOpen(user, password, pool.getConfig());
     }
+    embedded.internalOpen(user, password, pool.getConfig());
     embedded.callOnOpenListeners();
     return embedded;
   }