Author: rmannibucau
Date: Sun May 13 22:01:22 2012
New Revision: 1337991
URL: http://svn.apache.org/viewvc?rev=1337991&view=rev
Log:
equals method in custom classloader
Modified:
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
Modified:
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java?rev=1337991&r1=1337990&r2=1337991&view=diff
==============================================================================
---
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
(original)
+++
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
Sun May 13 22:01:22 2012
@@ -285,7 +285,7 @@ public class Deployer implements BundleL
/**
* using dynamic imports can be too tricky when this class is often enough.
- * Note: user can stil refine the version he needs...but manually.
+ * Note: user can still refine the version he needs...but manually.
*/
private static class OSGIClassLoader extends ClassLoader {
private final Bundle backingBundle;
@@ -298,6 +298,11 @@ public class Deployer implements BundleL
}
@Override
+ public boolean equals(final Object other) {
+ return this == other || backingBundle.equals(other);
+ }
+
+ @Override
protected Class findClass(final String name) throws
ClassNotFoundException {
try {
return fallbackBundle.loadClass(name);
@@ -398,47 +403,4 @@ public class Deployer implements BundleL
return new OSGIClassLoader(bundle,
OpenEJBBundleContextHolder.get().getBundle());
}
}
-
- private static Class<?> forceLoadClass(final String name) {
- final Bundle[] bundles = OpenEJBBundleContextHolder.get().getBundles();
- for (final Bundle bundle : bundles) {
- try {
- return bundle.loadClass(name);
- } catch (ClassNotFoundException e) {
- // ignored
- }
- }
- return null;
- }
-
- private static URL forceLoadResource(final String name) {
- final Bundle[] bundles = OpenEJBBundleContextHolder.get().getBundles();
- for (final Bundle bundle : bundles) {
- final URL url = bundle.getResource(name);
- if (url != null) {
- return url;
- }
- }
- return null;
- }
-
- private static Enumeration<URL> forceLoadResources(final String name) {
- final Bundle[] bundles = OpenEJBBundleContextHolder.get().getBundles();
- for (final Bundle bundle : bundles) {
- Enumeration<URL> url = null;
- try {
- url = bundle.getResources(name);
- } catch (IOException e) {
- // ignored
- }
- if (url != null && url.hasMoreElements()) {
- return url;
- }
- }
- return null;
- }
-
- private static String className(final String name) {
- return name.replace('/', '.');
- }
}
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java?rev=1337991&r1=1337990&r2=1337991&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
Sun May 13 22:01:22 2012
@@ -154,7 +154,7 @@ public class TomEEWebappLoader extends W
@Override
public boolean equals(Object other) {
- return other == this || other == webapp;
+ return other == this || webapp.equals(other);
}
}
}
