Browse Source

Merge branch '5.3.x'

pull/27618/head
Sam Brannen 4 years ago
parent
commit
63697ca06d
  1. 8
      spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java

8
spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java

@ -228,10 +228,10 @@ public abstract class ExtendedEntityManagerCreator { @@ -228,10 +228,10 @@ public abstract class ExtendedEntityManagerCreator {
if (emIfc != null) {
interfaces = cachedEntityManagerInterfaces.computeIfAbsent(emIfc, key -> {
Set<Class<?>> ifcs = new LinkedHashSet<>(4);
ifcs.add(key);
ifcs.add(EntityManagerProxy.class);
return ClassUtils.toClassArray(ifcs);
if (EntityManagerProxy.class.equals(key)) {
return new Class<?>[] {key};
}
return new Class<?>[] {key, EntityManagerProxy.class};
});
}
else {

Loading…
Cancel
Save