aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Jungmann2014-05-06 05:47:26 (EDT)
committerTomas Kraus2014-05-06 07:12:54 (EDT)
commit754f2e7c3a402e551bb97d1cf8edbcd129170dc9 (patch)
treefbb220d3aa9533a62d78145777fba8be876ccee9
parentbf6100856b60f5c4703eb7fb5e0a4b05174b09cb (diff)
downloadeclipselink.runtime-754f2e7c3a402e551bb97d1cf8edbcd129170dc9.zip
eclipselink.runtime-754f2e7c3a402e551bb97d1cf8edbcd129170dc9.tar.gz
eclipselink.runtime-754f2e7c3a402e551bb97d1cf8edbcd129170dc9.tar.bz2
Bug 434182 - running jpa full regression tests with securitymanager fails with nosuchmethoderror
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
-rw-r--r--jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
index 8f3ab4b..eda6d02 100644
--- a/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
+++ b/jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
@@ -164,14 +164,14 @@ public class JavaSECMPInitializer extends JPAInitializer {
}
URL[] urlPath = ((URLClassLoader)currentLoader).getURLs();
- ClassLoader tempLoader = null;
- if (System.getSecurityManager() != null) {
- try {
- Class[] argsClasses = new Class[] {this.getClass(), URL[].class, ClassLoader.class, Collection.class, boolean.class};
- Object[] args = new Object[] {this, urlPath, currentLoader, col, shouldOverrideLoadClassForCollectionMembers};
- Constructor classLoaderConstructor = (Constructor) AccessController.doPrivileged(new PrivilegedGetConstructorFor(TempEntityLoader.class, argsClasses, true));
- tempLoader = (ClassLoader) AccessController.doPrivileged(new PrivilegedInvokeConstructor(classLoaderConstructor, args));
- } catch (PrivilegedActionException privilegedException) {
+ ClassLoader tempLoader = null;
+ if (System.getSecurityManager() != null) {
+ try {
+ Class[] argsClasses = new Class[] {URL[].class, ClassLoader.class, Collection.class, boolean.class};
+ Object[] args = new Object[] {urlPath, currentLoader, col, shouldOverrideLoadClassForCollectionMembers};
+ Constructor classLoaderConstructor = (Constructor) AccessController.doPrivileged(new PrivilegedGetConstructorFor(TempEntityLoader.class, argsClasses, true));
+ tempLoader = (ClassLoader) AccessController.doPrivileged(new PrivilegedInvokeConstructor(classLoaderConstructor, args));
+ } catch (PrivilegedActionException privilegedException) {
throw new PersistenceException(EntityManagerSetupException.failedToInstantiateTemporaryClassLoader(privilegedException));
}
} else {