From 85898f20498da0594141992e77b5f4a3557c0295 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Thu, 21 Nov 2013 15:53:57 +0000 Subject: QPID-5364: [Java Broker Management] Give RestServlet instances different servlet names (for diagnostic purposes) and correct error message used when path info has too many components. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1544228 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/management/plugin/HttpManagement.java | 2 +- .../qpid/server/management/plugin/servlet/rest/RestServlet.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 1099aec79d..0f5e5e8f58 100644 --- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -340,7 +340,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem private void addRestServlet(ServletContextHandler root, String name, Class... hierarchy) { - root.addServlet(new ServletHolder(new RestServlet(hierarchy)), "/rest/" + name + "/*"); + root.addServlet(new ServletHolder(name, new RestServlet(hierarchy)), "/rest/" + name + "/*"); } private void logOperationalListenMessages(Server server) diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java index c05b4e30d6..08a8676601 100644 --- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java +++ b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java @@ -121,7 +121,10 @@ public class RestServlet extends AbstractServlet { if(pathInfoElements.length > _hierarchy.length) { - throw new IllegalArgumentException("Too many entries in path. Expected " + _hierarchy.length + "; path: " + names); + throw new IllegalArgumentException("Too many entries in path for REST servlet " + + getServletName() + ". Expected hierarchy length: " + _hierarchy.length + + "; Request hierarchy length: " + pathInfoElements.length + + "; Path Elements: " + Arrays.toString(pathInfoElements)); } names.addAll(Arrays.asList(pathInfoElements)); } -- cgit v1.2.1