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

overridden @PersistenceContext annotations on subclass methods are being processed correctly (SPR-8594)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-08-12 13:54:17 +00:00
parent b9ebdd28fb
commit 49e61d2680
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
View File

@@ -27,7 +27,6 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceContext;
@@ -384,7 +383,7 @@ public class PersistenceAnnotationBeanPostProcessor
for (Method method : targetClass.getDeclaredMethods()) {
PersistenceContext pc = method.getAnnotation(PersistenceContext.class);
PersistenceUnit pu = method.getAnnotation(PersistenceUnit.class);
if (pc != null || pu != null &&
if ((pc != null || pu != null) &&
method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
if (Modifier.isStatic(method.getModifiers())) {
throw new IllegalStateException("Persistence annotations are not supported on static methods");