From ae1583bfe01bdc3f43fdb6d590ab7c6a32e0be5a Mon Sep 17 00:00:00 2001 From: Jan Hajnar Date: Thu, 23 Apr 2015 09:15:43 +0200 Subject: [PATCH] Bug 2983 - POST operation to list only accepts data for keys * added catch for ResultAlreadySetException in JsonNormalizedNodeBodyReader Change-Id: I07d8b8b63e5c2de84b0ee7ec66013d38c58c7b49 Signed-off-by: Jan Hajnar --- .../sal/rest/impl/JsonNormalizedNodeBodyReader.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java index 3be247a3bb..5d63c9c011 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java @@ -36,6 +36,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; +import org.opendaylight.yangtools.yang.data.impl.schema.ResultAlreadySetException; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -106,6 +107,11 @@ public class JsonNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPr return new NormalizedNodeContext(path,result); } catch (final RestconfDocumentedException e) { throw e; + } catch (final ResultAlreadySetException e) { + LOG.debug("Error parsing json input:", e); + + throw new RestconfDocumentedException("Error parsing json input: Failed to create new parse result data. " + + "Are you creating multiple resources/subresources in POST request?"); } catch (final Exception e) { LOG.debug("Error parsing json input", e); -- 2.36.6