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

#1999 - Additionally support empty string for read only url with config.isAutoReadOnlyDataSource()

Browse Source
This commit is contained in:
rob bygrave
2020-04-29 22:15:15 +12:00
parent 2a03198393
commit ed0e9e7006
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/core/InitDataSource.java
+10 -2
View File
@@ -74,14 +74,22 @@ class InitDataSource {
// it has explicitly been set to null, not expected but ok
return null;
}
final String url = roConfig.getUrl();
if ("none".equalsIgnoreCase(url) || (url == null && !config.isAutoReadOnlyDataSource())) {
final String readOnlyUrl = roConfig.getUrl();
if ("none".equalsIgnoreCase(readOnlyUrl) || notAutoReadOnly(readOnlyUrl)) {
// no read-only DataSource will be used
return null;
}
return roConfig;
}
private boolean notAutoReadOnly(String readOnlyUrl) {
return isEmpty(readOnlyUrl) && !config.isAutoReadOnlyDataSource();
}
private boolean isEmpty(String url) {
return url == null || url.trim().isEmpty();
}
private DataSource createFromConfig(DataSourceConfig dsConfig, boolean readOnly) {
if (dsConfig == null) {
throw new PersistenceException("No DataSourceConfig defined for " + config.getName());