From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 16 Sep 2016 08:17:32 +0000 (+0300)
Subject: Merge commit '728147df5d63a3333daff3d8c0e9bfd4f5597e3a'
X-Git-Tag: v1.25.0~114
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=9b79343ca481f448a4bcdeb3c2b35af91c8dfb62;p=simantics%2Fplatform.git

Merge commit '728147df5d63a3333daff3d8c0e9bfd4f5597e3a'

refs #6694
---

9b79343ca481f448a4bcdeb3c2b35af91c8dfb62
diff --cc bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
index 4a673b97d,bbeb7541e..8957a2167
--- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
@@@ -30,12 -30,12 +30,12 @@@ import org.simantics.db.exception.Datab
  import org.simantics.utils.FileUtils;
  
  public class ServerManagerFactory {
-     public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException {
-         Driver driver = Manager.getDriver(databaseId);
+     public static ServerManager create(String databaseDriverId, String address) throws IOException, DatabaseException {
+         Driver driver = Manager.getDriver(databaseDriverId);
          if (driver == null)
-             throw new IllegalArgumentException("Database driver with ID " + databaseId + " could not be found!");
-         System.out.println("ServerManagerFactory.create called with id " + databaseId + ", driver is " + driver.toString());
-         DatabaseUserAgent agent = Manager.getUserAgent(databaseId);
 -            throw new IllegalArgumentException("Database driver for ID " + databaseDriverId + " Could not be found!");
 -        System.out.println("ServerManagerFactory.create called with databaseId=" + databaseDriverId + " and driver is " + driver.toString());
++            throw new IllegalArgumentException("Database driver with ID " + databaseDriverId + " could not be found!");
++        System.out.println("ServerManagerFactory.create called with id " + databaseDriverId + ", driver is " + driver.toString());
+         DatabaseUserAgent agent = Manager.getUserAgent(databaseDriverId);
          if (agent != null)
              driver.setDatabaseUserAgent(address, agent);
          return new ServerManager(driver);