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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2014-10-22 01:10:01 +02:00
parent 0e907764a4
commit 15c8987cc4
15 changed files with 154 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/package-info.java
View File

@@ -1,9 +1,5 @@
/**
*
* Support package for the Hibernate3 Annotation add-on,
* which supports EJB3-compliant JDK 1.5+ annotations for mappings.
*
* Support package for the Hibernate 3 Annotation add-on,
* which supports JPA-compliant Java 5+ annotations for mappings.
*/
package org.springframework.orm.hibernate3.annotation;

12
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -244,8 +244,8 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
return new JpaSystemException(ex);
}
protected Session getSession(EntityManager em) {
return em.unwrap(Session.class);
protected Session getSession(EntityManager entityManager) {
return entityManager.unwrap(Session.class);
}
@@ -270,14 +270,14 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
private static class HibernateConnectionHandle implements ConnectionHandle {
private final Session session;
// This will find a corresponding method on Hibernate 3.x but not on 4.x
private static final Method sessionConnectionMethod =
ClassUtils.getMethodIfAvailable(Session.class, "connection");
private static volatile Method connectionMethodToUse = sessionConnectionMethod;
private final Session session;
public HibernateConnectionHandle(Session session) {
this.session = session;
}
@@ -286,7 +286,7 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
public Connection getConnection() {
try {
if (connectionMethodToUse == null) {
// Reflective lookup trying to find SessionImpl's connection() on Hibernate 4.x
// Reflective lookup to find SessionImpl's connection() method on Hibernate 4.x
connectionMethodToUse = this.session.getClass().getMethod("connection");
}
return (Connection) ReflectionUtils.invokeMethod(connectionMethodToUse, this.session);