diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java index 2913925c72..ae5f3853b3 100644 --- a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java +++ b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java @@ -539,7 +539,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana } } - Transaction hibTx = null; + Transaction hibTx; // Register transaction timeout. int timeout = determineTimeout(definition); diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java index d9a06ccf22..bff19d26c7 100644 --- a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java +++ b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java @@ -44,7 +44,7 @@ import org.springframework.util.ClassUtils; * Subclass of Spring's standard LocalSessionFactoryBean for Hibernate, * supporting JDK 1.5+ annotation metadata for mappings. * - *

Note: This class requires Hibernate 3.2 or higher, with the + *

Note: This class requires Hibernate 3.2 or later, with the * Java Persistence API and the Hibernate Annotations add-on present. * *

Example for an AnnotationSessionFactoryBean bean definition: @@ -240,8 +240,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem * @param config the current AnnotationConfiguration object * @throws HibernateException in case of Hibernate initialization errors */ - protected void postProcessAnnotationConfiguration(AnnotationConfiguration config) - throws HibernateException { + protected void postProcessAnnotationConfiguration(AnnotationConfiguration config) throws HibernateException { } } diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index 4ab6dfe699..e1e396ada2 100644 --- a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2009 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. @@ -16,9 +16,8 @@ package org.springframework.orm.jpa.vendor; -import java.util.Map; -import java.util.Properties; import java.util.HashMap; +import java.util.Map; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.spi.PersistenceProvider; @@ -42,7 +41,7 @@ import org.springframework.orm.jpa.JpaDialect; /** * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for - * Hibernate EntityManager. Developed and tested against Hibernate 3.2 and 3.3. + * Hibernate EntityManager. Developed and tested against Hibernate 3.3. * *

Exposes Hibernate's persistence provider and EntityManager extension interface, * and supports {@link AbstractJpaVendorAdapter}'s common configuration settings.