From abb375b04336f906e84eb1de660414a6c889116e Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Thu, 7 Jan 2016 09:03:00 +0000 Subject: [PATCH] Revert "BUG 2594 - PUT method returns wrong status on create" This reverts commit 93816f7aeacd89785f083a82036bf6a7d90c316a. Change-Id: I741add04db100359087d89537744d027a2c4fb6f Signed-off-by: Tomas Cere --- .../opendaylight/netconf/sal/restconf/impl/RestconfImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java index bc62b3eff9..18b02cfa34 100644 --- a/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java +++ b/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java @@ -714,14 +714,11 @@ public class RestconfImpl implements RestconfService { * document the behavior). */ int tries = 2; - Status status = Status.NOT_MODIFIED; while(true) { try { if (mountPoint != null) { - status = broker.readConfigurationData(mountPoint, normalizedII) != null ? Status.OK : Status.CREATED; broker.commitConfigurationDataPut(mountPoint, normalizedII, payload.getData()).checkedGet(); } else { - status = broker.readConfigurationData(normalizedII) != null ? Status.OK : Status.CREATED; broker.commitConfigurationDataPut(controllerContext.getGlobalSchema(), normalizedII, payload.getData()).checkedGet(); } @@ -745,7 +742,7 @@ public class RestconfImpl implements RestconfService { } } - return Response.status(status).build(); + return Response.status(Status.OK).build(); } private static void validateTopLevelNodeName(final NormalizedNodeContext node, -- 2.36.6