root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge pull request #3605 from tan9/patch-3 

* pr/3605:
  Catch more general Hibernate 4.2 LinkageError
This commit is contained in:
Phillip Webb 2015-09-10 14:58:44 -07:00
parent b7e9f805c9 a5430d8a0c
commit 624350f41e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
View File

@ -147,8 +147,9 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration {
vendorProperties.put(JTA_PLATFORM, new SpringJtaPlatform( vendorProperties.put(JTA_PLATFORM, new SpringJtaPlatform(
jtaTransactionManager)); jtaTransactionManager));
} }
catch (NoClassDefFoundError ex) { catch (LinkageError ex) {
// Can happen if Hibernate 4.2 is used // NoClassDefFoundError can happen if Hibernate 4.2 is used and some
// containers (e.g. JBoss EAP 6) wraps it in the superclass LinkageError
if (!isUsingJndi()) { if (!isUsingJndi()) {
throw new IllegalStateException("Unable to set Hibernate JTA " throw new IllegalStateException("Unable to set Hibernate JTA "
+ "platform, are you using the correct " + "platform, are you using the correct "