summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-14 11:31:24 (EDT)
committerEike Stepper2007-08-14 11:31:24 (EDT)
commit261cbb4d160a60d52e629d0a92cd46763f1d662c (patch)
treea93a13ced9d32354f0af4533b1c683be1b84a481
parentacba50594d3bec8c2c8f11150f75b6b85d2bbffb (diff)
downloadcdo-261cbb4d160a60d52e629d0a92cd46763f1d662c.zip
cdo-261cbb4d160a60d52e629d0a92cd46763f1d662c.tar.gz
cdo-261cbb4d160a60d52e629d0a92cd46763f1d662c.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java2
2 files changed, 11 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index dace7b4..072f1e2 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -34,6 +34,16 @@ public class DBStore extends Store
public DBStore(IDBAdapter dbAdapter, DataSource dataSource)
{
super(TYPE);
+ if (dbAdapter == null)
+ {
+ throw new IllegalArgumentException("dbAdapter is null");
+ }
+
+ if (dataSource == null)
+ {
+ throw new IllegalArgumentException("dataSource is null");
+ }
+
this.dbAdapter = dbAdapter;
this.dataSource = dataSource;
}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
index 26a132d..3796bc3 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
@@ -55,7 +55,7 @@ public class DBStoreFactory implements IStoreFactory
}
Element dbAdapterConfig = (Element)dbAdapterConfigs.item(0);
- String dbAdapterName = dbAdapterConfig.getAttribute("name");
+ String dbAdapterName = dbAdapterConfig.getAttribute("type");
return DBUtil.getDBAdapter(dbAdapterName);
}