Skip to content

Commit dc8a776

Browse files
committed
Early log entry for async EntityManagerFactory initialization failure
Closes gh-26093
1 parent 40a79a8 commit dc8a776

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -193,8 +193,8 @@ public String getPersistenceUnitName() {
193193
* {@code Persistence.createEntityManagerFactory} (if any).
194194
* <p>Can be populated with a String "value" (parsed via PropertiesEditor) or a
195195
* "props" element in XML bean definitions.
196-
* @see javax.persistence.Persistence#createEntityManagerFactory(String, java.util.Map)
197-
* @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(javax.persistence.spi.PersistenceUnitInfo, java.util.Map)
196+
* @see javax.persistence.Persistence#createEntityManagerFactory(String, Map)
197+
* @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
198198
*/
199199
public void setJpaProperties(Properties jpaProperties) {
200200
CollectionUtils.mergePropertiesIntoMap(jpaProperties, this.jpaPropertyMap);
@@ -204,8 +204,8 @@ public void setJpaProperties(Properties jpaProperties) {
204204
* Specify JPA properties as a Map, to be passed into
205205
* {@code Persistence.createEntityManagerFactory} (if any).
206206
* <p>Can be populated with a "map" or "props" element in XML bean definitions.
207-
* @see javax.persistence.Persistence#createEntityManagerFactory(String, java.util.Map)
208-
* @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(javax.persistence.spi.PersistenceUnitInfo, java.util.Map)
207+
* @see javax.persistence.Persistence#createEntityManagerFactory(String, Map)
208+
* @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
209209
*/
210210
public void setJpaPropertyMap(@Nullable Map<String, ?> jpaProperties) {
211211
if (jpaProperties != null) {
@@ -400,10 +400,13 @@ private EntityManagerFactory buildNativeEntityManagerFactory() {
400400
String message = ex.getMessage();
401401
String causeString = cause.toString();
402402
if (!message.endsWith(causeString)) {
403-
throw new PersistenceException(message + "; nested exception is " + causeString, cause);
403+
ex = new PersistenceException(message + "; nested exception is " + causeString, cause);
404404
}
405405
}
406406
}
407+
if (logger.isErrorEnabled()) {
408+
logger.error("Failed to initialize JPA EntityManagerFactory: " + ex.getMessage());
409+
}
407410
throw ex;
408411
}
409412

0 commit comments

Comments
 (0)