github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ability to override default datasource with java parameter.

Browse Source
This commit is contained in:
Ryszard-Trojnacki
2015-04-02 08:23:33 +02:00
parent 0a15cdd7b2
commit a192b0cdbf
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebean/PrimaryServer.java
+7 -1
View File
@@ -46,7 +46,13 @@ class PrimaryServer {
if (globalProperties == null) {
globalProperties = PropertyMap.defaultProperties();
}
defaultServerName = globalProperties.getProperty("datasource.default");
defaultServerName = System.getProperty("datasource.default");
if(defaultServerName == null) {
defaultServerName = System.getProperty("ebean.default.datasource");
}
if(defaultServerName == null) {
defaultServerName = globalProperties.getProperty("datasource.default");
}
if (defaultServerName == null) {
defaultServerName = globalProperties.getProperty("ebean.default.datasource");
}