#1084 - NPE When DB Migration generation run with @WhoCreated mapping

This commit is contained in:
rob bygrave committed 2017-08-24 22:15:01 +12:00
1 parent dc96fb9ad5
commit 57231c80a8
3 files changed
+24 -2

No files matched your search

@@ -268,7 +268,7 @@ public class DefaultContainer implements SpiContainer {
private DataSource getDataSourceFromConfig(ServerConfig config) {
if (config.isDbOffline() || DbOffline.isSet()) {
if (config.isOfflineMode()) {
logger.debug("... DbOffline using platform [{}]", DbOffline.getPlatform());
return null;
}
@@ -334,7 +334,7 @@ public class DefaultContainer implements SpiContainer {
*/
private boolean checkDataSource(ServerConfig serverConfig) {
if (serverConfig.isDbOffline() || DbOffline.isSet()) {
if (serverConfig.isOfflineMode()) {
return false;
}
@@ -45,6 +45,10 @@ public class GeneratedPropertyFactory {
if (currentUserProvider != null) {
generatedWhoCreated = new GeneratedWhoCreated(currentUserProvider);
generatedWhoModified = new GeneratedWhoModified(currentUserProvider);
} else if (serverConfig.isOfflineMode()) {
currentUserProvider = new DummyCurrentUser();
generatedWhoCreated = new GeneratedWhoCreated(currentUserProvider);
generatedWhoModified = new GeneratedWhoModified(currentUserProvider);
} else {
generatedWhoCreated = null;
generatedWhoModified = null;
@@ -150,4 +154,11 @@ public class GeneratedPropertyFactory {
// do nothing
}
}
private static class DummyCurrentUser implements CurrentUserProvider {
@Override
public Object currentUser() {
throw new RuntimeException("never called");
}
}
}