github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-23 10:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

#493 - ENH: Multi-tenant support - update bootup DataSource check

Browse Source
This commit is contained in:
Rob Bygrave
2016-12-01 20:43:47 +13:00
parent 3a28dd0d55
commit dfa336239f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java
+6 -3
View File
@@ -100,10 +100,13 @@ public class DefaultContainer implements SpiContainer {
if (serverConfig.isDocStoreOnly()) {
serverConfig.setDatabasePlatform(new H2Platform());
} else {
if (!serverConfig.getTenantMode().isDynamicDataSource()) {
TenantMode tenantMode = serverConfig.getTenantMode();
if (!TenantMode.DB.equals(tenantMode)) {
setDataSource(serverConfig);
// check the autoCommit and Transaction Isolation
online = checkDataSource(serverConfig);
if (!tenantMode.isDynamicDataSource()) {
// check the autoCommit and Transaction Isolation
online = checkDataSource(serverConfig);
}
}
}
src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
+1 -1
View File
@@ -2506,7 +2506,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
* Set the Tenant Id value to the bean.
*/
public void setTenantId(EntityBean entityBean, Object tenantId) {
if (tenantId != null) {
if (tenant != null) {
tenant.setValue(entityBean, tenantId);
}
}