HibernateExceptionTranslator avoids JPA IllegalState/ArgumentException translation

Issue: SPR-14681

HibernateExceptionTranslator avoids JPA IllegalState/ArgumentException translation
Issue: SPR-14681
34ab818d · Juergen Hoeller · 480cd2c2 · 34ab818d
隐藏空白更改
内联并排

Showing with 6 addition and 3 deletion

spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java ...ramework/orm/hibernate5/HibernateExceptionTranslator.java +6 -3

未找到文件。
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
@@ -48,10 +48,13 @@ public class HibernateExceptionTranslator implements PersistenceExceptionTransla
 		if (ex instanceof HibernateException) {
 			return convertHibernateAccessException((HibernateException) ex);
 		}
-		if (ex instanceof PersistenceException && ex.getCause() instanceof HibernateException) {
-			return convertHibernateAccessException((HibernateException) ex.getCause());
+		if (ex instanceof PersistenceException) {
+			if (ex.getCause() instanceof HibernateException) {
+				return convertHibernateAccessException((HibernateException) ex.getCause());
+			}
+			return EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ex);
 		}
-		return EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ex);
+		return null;
 	}

 	/**