Fixup processing reporting

We need to report the events as done even if the downstream writer does
not accept the object model. If we do not, we will get confused about
how the node should be processed.

JIRA: NETCONF-868
Change-Id: I5a76c5a2af79ecaaf4c80f832774b08d60d03379
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit d705d8e40d4a11c3ed0ca879128782dd6988eeb7)

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java
index 8872e56ae56dbdf35882d787f5394e592b60cc30..69795723a346b895aaffa6551e3fab104a6aeb59 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java
@@ -173,16 +173,16 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod
                     writer.scalarValue(anyxmlNode.body());
                 }
                 writer.endNode();
-                return true;
             }
+            return true;
         } else if (node instanceof AnydataNode) {
             final AnydataNode<?> anydataNode = (AnydataNode<?>)node;
             final Class<?> objectModel = anydataNode.bodyObjectModel();
             if (writer.startAnydataNode(anydataNode.getIdentifier(), objectModel)) {
                 writer.scalarValue(anydataNode.body());
                 writer.endNode();
-                return true;
             }
+            return true;
         }
 
         return false;