X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.project%2Fsrc%2Forg%2Fsimantics%2Fproject%2Fmanagement%2FServerManagerFactory.java;h=bbeb7541e0892e86c1eb45c8a8c9c5a8c168bed5;hb=c46f0ff4dd8a3adc57658770827a105209f428a0;hp=c34f9ef8019ec285bc68585467dcf81fc4c67791;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
index c34f9ef80..bbeb7541e 100644
--- 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,10 +30,12 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.utils.FileUtils;
 
 public class ServerManagerFactory {
-    public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException {
-        Driver driver = Manager.getDriver(databaseId);
-        System.out.println("ServerManagerFactory.create called with databaseId=" + databaseId + " and driver is " + driver.toString());
-        DatabaseUserAgent agent = Manager.getUserAgent(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 for ID " + databaseDriverId + " Could not be found!");
+        System.out.println("ServerManagerFactory.create called with databaseId=" + databaseDriverId + " and driver is " + driver.toString());
+        DatabaseUserAgent agent = Manager.getUserAgent(databaseDriverId);
         if (agent != null)
             driver.setDatabaseUserAgent(address, agent);
         return new ServerManager(driver);
@@ -83,7 +85,7 @@ public class ServerManagerFactory {
 		} catch (IllegalAccessException e) {
 			throw new RuntimeException(e);
 		} catch (InvocationTargetException e) {
-			throw new RuntimeException(e);
+			throw new RuntimeException(e.getCause());
 		}
 	}