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/03/26 14:23:25 UTC

svn commit: r1669339 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java

Author: orudyy
Date: Thu Mar 26 13:23:24 2015
New Revision: 1669339

URL: http://svn.apache.org/r1669339
Log:
QPID-6438: Delete unreachable code from RestServlet#performCreateOrUpdate

Modified:
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1669339&r1=1669338&r2=1669339&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Thu Mar 26 13:23:24 2015
@@ -426,18 +426,11 @@ public class RestServlet extends Abstrac
         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();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org