summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java2
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java5
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));
}