Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defensive null check in case Hibernate autoconfig is off

Browse Source 
If the Hibernate autoconfig is not used to create an EntityManager
then I suppose it's possible that the JpaProperties might be null
when everything else is ready for the event to be published.

There's no test case because I think it's a corner case.

Fxies gh-1075
This commit is contained in:
Dave Syer
2014-06-11 16:54:11 +01:00
parent 32a220da8f
commit 8d6f003e9a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
View File

@@ -73,6 +73,9 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
} }
private boolean isInitializingDatabase() { private boolean isInitializingDatabase() {
if (this.properties == null) {
return true; // better safe than sorry
}
Map<String, String> hibernate = this.properties Map<String, String> hibernate = this.properties
.getHibernateProperties(this.dataSource); .getHibernateProperties(this.dataSource);
if (hibernate.containsKey("hibernate.hbm2ddl.auto")) { if (hibernate.containsKey("hibernate.hbm2ddl.auto")) {