summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2015-03-26 13:23:24 +0000
committerAlex Rudyy <orudyy@apache.org>2015-03-26 13:23:24 +0000
commit9206eb02974a8aaf9e4693c8e1063ea93b82253c (patch)
tree5e1ac6bf436c70b9af39acbe9074867584291c6c
parentf604898fcbdd1acb30647bf44d743633eec1879f (diff)
downloadqpid-python-9206eb02974a8aaf9e4693c8e1063ea93b82253c.tar.gz
QPID-6438: Delete unreachable code from RestServlet#performCreateOrUpdate
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1669339 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java15
1 files changed, 4 insertions, 11 deletions
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 cb950612cf..275d7f6794 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
@@ -426,18 +426,11 @@ public class RestServlet extends AbstractServlet
boolean updateOnlyAllowed = isFullObjectURL && "POST".equalsIgnoreCase(request.getMethod());
try
{
- if (names.isEmpty())
+ if (names.isEmpty() && _hierarchy.length == 0)
{
- if (_hierarchy.length == 0)
- {
- getBroker().setAttributes(providedObject);
- response.setStatus(HttpServletResponse.SC_OK);
- return;
- }
- else if (isFullObjectURL)
- {
- throw new ServletException("Cannot identify request target object");
- }
+ getBroker().setAttributes(providedObject);
+ response.setStatus(HttpServletResponse.SC_OK);
+ return;
}
ConfiguredObject theParent = getBroker();