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

Tweak to PrimaryServer to handle empty string defaultServerName values

Browse Source
This commit is contained in:
rbygrave
2015-04-12 18:13:26 +12:00
parent de372bfb89
commit 1260edc8ed
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebean/PrimaryServer.java
+27 -8
View File
@@ -46,16 +46,35 @@ class PrimaryServer {
if (globalProperties == null) {
globalProperties = PropertyMap.defaultProperties();
}
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");
defaultServerName = determineDefaultServerName();
}
return globalProperties;
}
/**
* Determine and return the default server name checking system environment variables and then global properties.
*/
private static String determineDefaultServerName() {
String defaultServerName = System.getProperty("datasource.default");
if (isEmpty(defaultServerName)) {
defaultServerName = System.getProperty("ebean.default.datasource");
}
if (isEmpty(defaultServerName)) {
defaultServerName = globalProperties.getProperty("datasource.default");
}
if (isEmpty(defaultServerName)) {
defaultServerName = globalProperties.getProperty("ebean.default.datasource");
}
return defaultServerName;
}
/**
* Return true if the string is null or empty.
*/
private static boolean isEmpty(String value) {
return value == null || value.trim().length() == 0;
}
}