#715 checking for PVAStructureArray before PVAArray

Author: shroffk

core/pv/src/main/java/org/phoebus/pv/pva/PVAStructureHelper.java

@@ -69,29 +69,28 @@ public static VType getVType(final PVAStructure struct, final PVNameHelper name_
                 actual = (PVAStructure) field;
             else if (field instanceof PVANumber)
                 return Decoders.decodeNumber(struct, (PVANumber) field);
-            else if (field instanceof PVAArray)
-                return Decoders.decodeArray(struct, (PVAArray) field);
-            else if (field instanceof PVAString)
-                return Decoders.decodeString(struct, (PVAString) field);
-        }
-
-        // Handle element references in arrays
-        if (elementIndex.isPresent())
-        {
-            final PVAData field = struct.get(name_helper.getField());
-            if (field instanceof PVAStructureArray)
+            else if (field instanceof PVAStructureArray)
             {
-                actual = ((PVAStructureArray) field).get()[elementIndex.get()];
+                if (elementIndex.isPresent())
+                {
+                    actual = ((PVAStructureArray) field).get()[elementIndex.get()];
+                }
             }
-            else if(field instanceof PVAArray)
-            {
-                return decodeNTArray(actual, elementIndex.get());
-            }
-            else
+            else if (field instanceof PVAArray)
             {
-                throw new Exception("Expected struct array for field " + name_helper.getField() + ", got " + struct);
+                if (elementIndex.isPresent())
+                {
+                    return decodeNTArray(struct, elementIndex.get());
+                }
+                else
+                {
+                    return Decoders.decodeArray(struct, (PVAArray) field);
+                }
             }
+            else if (field instanceof PVAString)
+                return Decoders.decodeString(struct, (PVAString) field);
         }
+
         // Handle normative types
         String type = actual.getStructureName();
         if (type.startsWith("epics:nt/"))