diff options
| author | Keith Wall <kwall@apache.org> | 2013-11-21 15:53:57 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2013-11-21 15:53:57 +0000 |
| commit | 9fb70750092b7164c80d11fae51302208b162c93 (patch) | |
| tree | 2f47ff776ed8fe6396009bdb3e4d715099aa3120 /qpid/java | |
| parent | 5ea8ab45cbd0181bc1acef84f4f1932e21c096cf (diff) | |
| download | qpid-python-9fb70750092b7164c80d11fae51302208b162c93.tar.gz | |
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@1544228 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 1099aec79d..0f5e5e8f58 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/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<? extends ConfiguredObject>... 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/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java index c05b4e30d6..08a8676601 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java +++ b/qpid/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)); } |