From: Robert Varga <rovarga@cisco.com>
Date: Mon, 25 Jan 2016 09:58:55 +0000 (+0100)
Subject: BUG-4295: handle merge into unkeyed list
X-Git-Tag: release/beryllium~16
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=f397c65a67e76abe9615a5d2152c381566a27414

BUG-4295: handle merge into unkeyed list

A merge into an unkeyed list equals to a write.

Change-Id: Iaded1cab2bdf38ee9595ebfe579dbb566b2beae4
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit a88bcb677187ed7a687890c33d24c2c7fe224c54)
---

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java
index dacba5aefe..d93d4971d1 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java
@@ -38,7 +38,8 @@ final class UnkeyedListModificationStrategy extends SchemaAwareApplyOperation {
 
     @Override
     protected TreeNode applyMerge(final ModifiedNode modification, final TreeNode currentMeta, final Version version) {
-        throw new IllegalStateException("Invalid merge into unkeyed list");
+        // A merge operation is promoted into a write
+        return applyWrite(modification, Optional.of(currentMeta), version);
     }
 
     @Override