fixed issue on copy database in case of database open without authent…

…ication,issue #7761
orientechnologies · Oct 3, 2017 · a6c108c · a6c108c
1 parent 7154e82
commit a6c108c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 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
@@ -92,11 +92,26 @@ public ODatabaseDocumentEmbedded openNoAuthenticate(String name, String user) {
         embedded.init(config);
       }
       embedded.rebuildIndexes();
+      embedded.internalOpen(user, "nopwd", false);
+      embedded.callOnOpenListeners();
+      return embedded;
+    } catch (Exception e) {
+      throw OException.wrapException(new ODatabaseException("Cannot open database '" + name + "'"), e);
+    }
+  }
 
-      //** THIS IS COMMENTED OUT BECAUSE WE NEED BOTH (NO PASSWORD AND NO USER AUTHORIZATION CHECK).
-      // embedded.internalOpen(user, "nopwd", false);
-      ////////////////////////////////////////////////////////////////////////////////////////////
-
+  public ODatabaseDocumentEmbedded openNoAuthorization(String name, String user) {
+    try {
+      final ODatabaseDocumentEmbedded embedded;
+      OrientDBConfig config = solveConfig(null);
+      synchronized (this) {
+        OAbstractPaginatedStorage storage = getOrInitStorage(name);
+        // THIS OPEN THE STORAGE ONLY THE FIRST TIME
+        storage.open(config.getConfigurations());
+        embedded = factory.newInstance(storage);
+        embedded.init(config);
+      }
+      embedded.rebuildIndexes();
       embedded.callOnOpenListeners();
       return embedded;
     } catch (Exception e) {

diff --git a/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentEmbedded.java b/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentEmbedded.java
@@ -299,7 +299,13 @@ public void drop() {
   public ODatabaseDocumentInternal copy() {
     ODatabaseDocumentEmbedded database = new ODatabaseDocumentEmbedded(storage);
     database.init(config);
-    database.internalOpen(getUser().getName(), null, false);
+    String user;
+    if (getUser() != null) {
+      user = getUser().getName();
+    } else {
+      user = null;
+    }
+    database.internalOpen(user, null, false);
     database.callOnOpenListeners();
     this.activateOnCurrentThread();
     return database;
@@ -352,7 +358,7 @@ public OResultSet query(String query, Object[] args) {
     }
     OResultSet original = statement.execute(this, args);
     OLocalResultSetLifecycleDecorator result = new OLocalResultSetLifecycleDecorator(original);
-    this.queryStarted(result.getQueryId(),result);
+    this.queryStarted(result.getQueryId(), result);
     result.addLifecycleListener(this);
     return result;
   }
@@ -365,7 +371,7 @@ public OResultSet query(String query, Map args) {
     }
     OResultSet original = statement.execute(this, args);
     OLocalResultSetLifecycleDecorator result = new OLocalResultSetLifecycleDecorator(original);
-    this.queryStarted(result.getQueryId(),result);
+    this.queryStarted(result.getQueryId(), result);
     result.addLifecycleListener(this);
     return result;
   }
@@ -375,7 +381,7 @@ public OResultSet command(String query, Object[] args) {
     OStatement statement = OSQLEngine.parse(query, this);
     OResultSet original = statement.execute(this, args);
     OLocalResultSetLifecycleDecorator result = new OLocalResultSetLifecycleDecorator(original);
-    this.queryStarted(result.getQueryId(),result);
+    this.queryStarted(result.getQueryId(), result);
     result.addLifecycleListener(this);
     return result;
   }
@@ -385,7 +391,7 @@ public OResultSet command(String query, Map args) {
     OStatement statement = OSQLEngine.parse(query, this);
     OResultSet original = statement.execute(this, args);
     OLocalResultSetLifecycleDecorator result = new OLocalResultSetLifecycleDecorator(original);
-    this.queryStarted(result.getQueryId(),result);
+    this.queryStarted(result.getQueryId(), result);
     result.addLifecycleListener(this);
     return result;
   }
@@ -395,7 +401,7 @@ public OResultSet execute(String language, String script, Object... args) {
     OScriptExecutor executor = OCommandManager.instance().getScriptExecutor(language);
     OResultSet original = executor.execute(this, script, args);
     OLocalResultSetLifecycleDecorator result = new OLocalResultSetLifecycleDecorator(original);
-    this.queryStarted(result.getQueryId(),result);
+    this.queryStarted(result.getQueryId(), result);
     result.addLifecycleListener(this);
     return result;
   }
@@ -405,7 +411,7 @@ public OResultSet execute(String language, String script, Map<String, ?> args) {
     OScriptExecutor executor = OCommandManager.instance().getScriptExecutor(language);
     OResultSet original = executor.execute(this, script, args);
     OLocalResultSetLifecycleDecorator result = new OLocalResultSetLifecycleDecorator(original);
-    this.queryStarted(result.getQueryId(),result);
+    this.queryStarted(result.getQueryId(), result);
     result.addLifecycleListener(this);
     return result;
   }
@@ -417,7 +423,7 @@ public OLocalResultSetLifecycleDecorator query(OExecutionPlan plan, Map<Object,
 
     OLocalResultSet result = new OLocalResultSet((OInternalExecutionPlan) plan);
     OLocalResultSetLifecycleDecorator decorator = new OLocalResultSetLifecycleDecorator(result);
-    this.queryStarted(decorator.getQueryId(),decorator);
+    this.queryStarted(decorator.getQueryId(), decorator);
     decorator.addLifecycleListener(this);
 
     return decorator;