You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/07/13 19:52:29 UTC
svn commit: r1610260 -
/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
Author: rmannibucau
Date: Sun Jul 13 17:52:29 2014
New Revision: 1610260
URL: http://svn.apache.org/r1610260
Log:
actually we don't need half of this since we run only on tomcat 7 now
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
Modified: tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java?rev=1610260&r1=1610259&r2=1610260&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java (original)
+++ tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java Sun Jul 13 17:52:29 2014
@@ -42,8 +42,7 @@ public class TomcatClassPath extends Bas
private final ClassLoader commonLoader;
private final ClassLoader serverLoader;
- private Method addRepositoryMethod;
- private Method addURLMethod;
+ private final Method addRepositoryMethod;
public TomcatClassPath() {
this(getCommonLoader(getContextClassLoader()));
@@ -53,13 +52,8 @@ public class TomcatClassPath extends Bas
this.commonLoader = classLoader;
try {
addRepositoryMethod = getAddRepositoryMethod();
- } catch (final Exception tomcat4Exception) {
-
- try {
- addURLMethod = getAddURLMethod();
- } catch (final Exception tomcat5Exception) {
- throw new LoaderRuntimeException("Failed accessing classloader for Tomcat 5 or 6", tomcat5Exception);
- }
+ } catch (final Exception e) {
+ throw new IllegalStateException("Ensure you use the right tomcat version");
}
final ClassLoader serverLoader = getServerLoader(getContextClassLoader());
@@ -143,12 +137,7 @@ public class TomcatClassPath extends Bas
classLoader = serverLoader;
}
- if (addRepositoryMethod != null) {
- final String path = jar.toExternalForm();
- addRepositoryMethod.invoke(classLoader, path);
- } else {
- addURLMethod.invoke(classLoader, jar);
- }
+ addRepositoryMethod.invoke(classLoader, jar.toExternalForm());
}
private boolean useServerClassLoader(final URL jar) {
@@ -221,23 +210,6 @@ public class TomcatClassPath extends Bas
}
- private Method getAddURLMethod() throws Exception {
- return AccessController.doPrivileged(new PrivilegedAction<Method>() {
- @Override
- public Method run() {
- Method method = null;
- try {
- final Class clazz = URLClassLoader.class;
- method = clazz.getDeclaredMethod("addURL", URL.class);
- method.setAccessible(true);
- } catch (final Exception e2) {
- e2.printStackTrace();
- }
- return method;
- }
- });
- }
-
private Method getAddRepositoryMethod() throws Exception {
return AccessController.doPrivileged(new PrivilegedAction<Method>() {
@Override