diff options
author | Michael Gorovoy | 2010-04-07 23:56:11 +0000 |
---|---|---|
committer | Michael Gorovoy | 2010-04-07 23:56:11 +0000 |
commit | fa7e3477e528e4bd5224a51702e34b5a02e5289f (patch) | |
tree | d850e11046f3b6c23b420d302a53a8b212448b4e | |
parent | a42b954a260a3cc4c6f22ba2ab5ff21c067629eb (diff) | |
download | org.eclipse.jetty.project-fa7e3477e528e4bd5224a51702e34b5a02e5289f.tar.gz org.eclipse.jetty.project-fa7e3477e528e4bd5224a51702e34b5a02e5289f.tar.xz org.eclipse.jetty.project-fa7e3477e528e4bd5224a51702e34b5a02e5289f.zip |
308009 ObjectMBean incorrectly casts getTargetException() to Exception
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1481 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r-- | VERSION.txt | 3 | ||||
-rw-r--r-- | jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/VERSION.txt b/VERSION.txt index d5b45855f6..b20257c556 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -4,10 +4,11 @@ jetty-7.1-SNAPSHOT + 306349 ProxyServlet does not work unless deployed at / + 307847 Fixed combining mime type parameters + 307898 Handle large/async websocket messages + + 308009 ObjectMBean incorrectly casts getTargetException() to Exception + + 308420 convert jetty-plus.xml to use DeploymentManager + JETTY-1202 Use platform default algorithm for SecureRandom + Fix jetty-plus.xml reference to addLifeCycle + Add AnnotationConfiguration to jetty-plus.xml - + 308420 convert jetty-plus.xml to use DeploymentManager jetty-7.0.2.v20100331 + 297552 Don't call Continuation timeouts from acceptor tick 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 6cba39de59..7ab8ebde5d 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 @@ -337,7 +337,7 @@ public class ObjectMBean implements DynamicMBean catch (InvocationTargetException e) { Log.warn(Log.EXCEPTION, e); - throw new ReflectionException((Exception) e.getTargetException()); + throw new ReflectionException(new Exception(e.getCause())); } } @@ -405,7 +405,7 @@ public class ObjectMBean implements DynamicMBean catch (InvocationTargetException e) { Log.warn(Log.EXCEPTION, e); - throw new ReflectionException((Exception) e.getTargetException()); + throw new ReflectionException(new Exception(e.getCause())); } } @@ -470,7 +470,7 @@ public class ObjectMBean implements DynamicMBean catch (InvocationTargetException e) { Log.warn(Log.EXCEPTION, e); - throw new ReflectionException((Exception) e.getTargetException()); + throw new ReflectionException(new Exception(e.getCause())); } finally { |