From 8047dda884b6a1744a53ee9ddaef881fc91af333 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 2 Aug 2018 11:03:53 +0200 Subject: [PATCH] DATAJPA-1379 - Polishing. Improve variable names. Original pull request: #287. --- .../springframework/data/jpa/provider/JpaClassUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java b/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java index f6f8d1cfb..a0c76db80 100644 --- a/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java +++ b/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java @@ -41,15 +41,18 @@ abstract class JpaClassUtils { * * @param em must not be {@literal null}. * @param type the fully qualified expected {@link EntityManager} type, must not be {@literal null} or empty. - * @return wether the given {@code EntityManager} is of the given type. + * @return whether the given {@code EntityManager} is of the given type. */ public static boolean isEntityManagerOfType(EntityManager em, String type) { + EntityManager entityManagerToUse = em; Object delegate = em.getDelegate(); + if (delegate instanceof EntityManager) { - em = (EntityManager) delegate; + entityManagerToUse = (EntityManager) delegate; } - return isOfType(em, type, delegate.getClass().getClassLoader()); + + return isOfType(entityManagerToUse, type, entityManagerToUse.getClass().getClassLoader()); } public static boolean isMetamodelOfType(Metamodel metamodel, String type) {