diff --git a/VERSION.txt b/VERSION.txt index cdd4feb3919..68d4da4c109 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,7 @@ jetty-7.4.3-SNAPSHOT + 295832 ProxyServlet more extensible and configurable + 302566 GZIP handler for embedded Jetty servers + + 332200 Eliminate expected exceptions from log while using org.eclipse.jetty.jmx bundle + 347617 Dynamically install/update/remove OSGi bundles discovered in the contexts folder + 347717 start.jar destroys dependent child of --exec + 347889 OSGi should follow directive visibility:=reexport for META-INF/web-fragments and resources diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java index 31a8986c861..6a1ca446729 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java @@ -139,7 +139,12 @@ public class ObjectMBean implements DynamicMBean } catch (ClassNotFoundException e) { - if (e.toString().endsWith("MBean")) + // The code below was modified to fix bug 332200. + // The issue was caused by additional information + // added to the message after the class name when + // Jetty is running in Apache Felix. + String klass = e.getMessage().split("[ ]", 2)[0]; + if (klass.endsWith("MBean")) Log.ignore(e); else Log.warn(e);