You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/08/12 10:17:03 UTC
svn commit: r1695444 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
Author: orudyy
Date: Wed Aug 12 08:17:02 2015
New Revision: 1695444
URL: http://svn.apache.org/r1695444
Log:
QPID-6690: Set exception on ListenableFuture on Errors like NoClassDefFoundError in order to interrupt unlimited get
Change RestServlet to return an error response instead of 500 on NoClassDefFoundError
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1695444&r1=1695443&r2=1695444&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Wed Aug 12 08:17:02 2015
@@ -522,6 +522,11 @@ public abstract class AbstractConfigured
{
returnVal.setException(e);
}
+ catch(Throwable t)
+ {
+ returnVal.setException(t);
+ throw t;
+ }
return null;
}
});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1695444&r1=1695443&r2=1695444&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Wed Aug 12 08:17:02 2015
@@ -533,7 +533,7 @@ public class RestServlet extends Abstrac
doOperation(request, response);
}
}
- catch (RuntimeException e)
+ catch (RuntimeException | NoClassDefFoundError e)
{
setResponseStatus(request, response, e);
}
@@ -901,7 +901,7 @@ public class RestServlet extends Abstrac
return true;
}
- private void setResponseStatus(HttpServletRequest request, HttpServletResponse response, RuntimeException e) throws IOException
+ private void setResponseStatus(HttpServletRequest request, HttpServletResponse response, Throwable e) throws IOException
{
if (e instanceof AccessControlException)
{
@@ -937,6 +937,10 @@ public class RestServlet extends Abstrac
}
else
{
+ if (e instanceof NoClassDefFoundError)
+ {
+ message = "Not found: " + message;
+ }
LOGGER.warn("Unexpected exception processing request ", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org