json parser BUGFIX wrong place for sorting

Fixes #608
CESNET · Sep 11, 2018 · dfcd4f6 · dfcd4f6
1 parent 18d67cd
commit dfcd4f6
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/parser_json.c b/src/parser_json.c
@@ -1256,12 +1256,6 @@ json_parse_data(struct ly_ctx *ctx, const char *data, const struct lys_node *sch
             lyv_multicases(result, NULL, prev ? &first_sibling : NULL, 0, NULL)) {
         goto error;
     }
-    /* order the elements by hand as it is not required of the input */
-    if (lyp_is_rpc_action(result->schema)) {
-        if (lyd_schema_sort(result, 1)) {
-            goto error;
-        }
-    }
 
     /* validation successful */
     if (result->schema->nodetype & (LYS_LIST | LYS_LEAFLIST)) {
@@ -1453,6 +1447,13 @@ lyd_parse_json(struct ly_ctx *ctx, const char *data, int options, const struct l
         goto error;
     }
 
+    /* order the elements by hand as it is not required of the JSON input */
+    if (lyp_is_rpc_action(result->schema)) {
+        if (lyd_schema_sort(result, 1)) {
+            goto error;
+        }
+    }
+
     if ((options & LYD_OPT_RPCREPLY) && (rpc_act->schema->nodetype != LYS_RPC)) {
         /* action reply */
         act_notif = reply_parent;