aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-07-12 06:19:42 (EDT)
committerGlyn Normington2010-07-12 06:19:42 (EDT)
commit9d28245116468467a2fcb9e28295ad4cd0a9d9cf (patch)
treebf47251c5f627765d8241e35397fa8e4382eb51d
parent3684081e471c917be305cd4fa3ac9d42905c0a73 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-9d28245116468467a2fcb9e28295ad4cd0a9d9cf.zip
org.eclipse.gemini.web.gemini-web-container-9d28245116468467a2fcb9e28295ad4cd0a9d9cf.tar.gz
org.eclipse.gemini.web.gemini-web-container-9d28245116468467a2fcb9e28295ad4cd0a9d9cf.tar.bz2
bug 319519: avoid throwing NoClassDefFoundError when running outside Equinox (e.g. on Apache Felix)
-rw-r--r--org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
index 1d8ead6..aa0856a 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
@@ -48,7 +48,9 @@ final class EquinoxBundleFileResolver implements BundleFileResolver {
try {
EquinoxBundleFileResolver.class.getClassLoader().loadClass(BundleHost.class.getName());
return true;
- } catch (Exception ex) {
+ } catch (Exception _) {
+ return false;
+ } catch (LinkageError _) {
return false;
}
}