commit b5cf6d21803503c4a71cd76fe04bde2b5c3882d6
author debanshur <debanshu.r@samsung.com> Wed Mar 21 19:09:48 2018 +0530
committer Andrea Campanella <andrea@opennetworking.org> Mon Mar 26 18:34:09 2018 +0000
tree a31b76075e203df6163328f674db497963cdd055
parent 225f4dcde7981b5a8a278eafd1a792a811d5cd40

Fix IndexOutOfBoundsException
List Operation was accessed for invalid index

Change-Id: Ib0aaabf8a6dbbcd588e3eba028db4810728fde8d

protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/utils/FromJsonUtil.java

diff --git a/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/utils/FromJsonUtil.java b/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/utils/FromJsonUtil.java
index 36cc16f..3383ba9 100644
--- a/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/utils/FromJsonUtil.java
+++ b/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/utils/FromJsonUtil.java
@@ -221,15 +221,21 @@
         List<OperationResult> operationResults = new ArrayList<OperationResult>();
         for (int i = 0; i < input.size(); i++) {
             JsonNode jsonNode = input.get(i);
-            Operation operation = operations.get(i);
+
             if (jsonNode != null && jsonNode.size() > 0) {
-                if (i >= operations.size() || !operation.getOp().equals("select")) {
+                if (i >= operations.size()) {
                     OperationResult or = objectMapper.convertValue(jsonNode, OperationResult.class);
                     operationResults.add(or);
                 } else {
-                    List<Row> rows = createRows(operation.getTableSchema(), jsonNode);
-                    OperationResult or = new OperationResult(rows);
-                    operationResults.add(or);
+                    Operation operation = operations.get(i);
+                    if (!operation.getOp().equals("select")) {
+                        OperationResult or = objectMapper.convertValue(jsonNode, OperationResult.class);
+                        operationResults.add(or);
+                    } else {
+                        List<Row> rows = createRows(operation.getTableSchema(), jsonNode);
+                        OperationResult or = new OperationResult(rows);
+                        operationResults.add(or);
+                    }
                 }
             }
         }