commit 09391edbde1f86494d876d370c8903ccfc981cf1
author Joe Grassel <fyrewyld@gmail.com> Thu Jan 18 09:43:05 2018 -0600
committer Joe Grassel <fyrewyld@gmail.com> Thu Jan 18 14:02:11 2018 -0600
tree 921cda52161ecdac73499a7bd5dec6e64d3b6542
parent 0a42ccb42276b2c65def540273e5bab470d1628c

Bug 529907 - EntityManagerSetupImpl.addBeanValidationListeners() should fall back on old method for finding helperClass

Signed-off-by: Joe Grassel <fyrewyld@gmail.com>
Reviewed-by: Will Dazey <dazeydev.3@gmail.com>

jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java

diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
index a29e8f6..acae123 100644
--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
@@ -78,6 +78,8 @@
  *       - 522312: Add the eclipselink.sequencing.start-sequence-at-nextval property
  *     10/24/2017-3.0 Tomas Kraus
  *       - 526419: Modify EclipseLink to reflect changes in JTA 1.1.
+ *     01/16/2018-2.7 Joe Grassel
+ *       - 529907: EntityManagerSetupImpl.addBeanValidationListeners() should fall back on old method for finding helperClass
  *****************************************************************************/
 package org.eclipse.persistence.internal.jpa;
 
@@ -3672,10 +3674,22 @@ private void addBeanValidationListeners(Map puProperties, ClassLoader appClassLo
             Class helperClass;
             try {
                 if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
-                    helperClass = AccessController.doPrivileged(
-                            new PrivilegedClassForName(helperClassName, true, appClassLoader));
+                    try {
+                        helperClass = AccessController.doPrivileged(
+                                new PrivilegedClassForName(helperClassName, true, appClassLoader));
+                    } catch (Throwable t) {
+                        // Try the ClassLoader that loaded Eclipselink classes
+                        ClassLoader eclipseLinkClassLoader = EntityManagerSetupImpl.class.getClassLoader();
+                        helperClass = AccessController.doPrivileged(new PrivilegedClassForName(helperClassName, true, eclipseLinkClassLoader));
+                    }                   
                 } else {
-                    helperClass = PrivilegedAccessHelper.getClassForName(helperClassName, true, appClassLoader);
+                    try {
+                        helperClass = PrivilegedAccessHelper.getClassForName(helperClassName, true, appClassLoader);
+                    } catch (Throwable t) {
+                        // Try the ClassLoader that loaded Eclipselink classes
+                        ClassLoader eclipseLinkClassLoader = EntityManagerSetupImpl.class.getClassLoader();
+                        helperClass = PrivilegedAccessHelper.getClassForName(helperClassName, true, eclipseLinkClassLoader);
+                    }                   
                 }
                 BeanValidationInitializationHelper beanValidationInitializationHelper = (BeanValidationInitializationHelper)helperClass.newInstance();
                 beanValidationInitializationHelper.bootstrapBeanValidation(puProperties, session, appClassLoader);