Allow empty - but not null - name of PVAStructure elements

ControlSystemStudio · Oct 29, 2023 · 0a74a71 · 0a74a71
1 parent 19dba58
commit 0a74a71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/core/pva/src/main/java/org/epics/pva/data/PVAStructure.java b/core/pva/src/main/java/org/epics/pva/data/PVAStructure.java
@@ -81,8 +81,8 @@ static PVAStructure decodeType(final PVATypeRegistry types, final String name, f
 
     /** @param name Name of the structure (may be "")
      *  @param struct_name Type name of the structure (may be "")
-     *  @param elements Elements, must be named
-     *  @throws IllegalArgumentException when an element is not named
+     *  @param elements Elements, name may be "", but not <code>null</code>
+     *  @throws IllegalArgumentException if an element name is <code>null</code>
      */
     public PVAStructure(final String name, final String struct_name, final PVAData... elements)
     {
@@ -91,16 +91,16 @@ public PVAStructure(final String name, final String struct_name, final PVAData..
 
     /** @param name Name of the structure (may be "")
      *  @param struct_name Type name of the structure (may be "")
-     *  @param elements Elements, must be named
-     *  @throws IllegalArgumentException when an element is not named
+     *  @param elements Elements, name may be "", but not <code>null</code>
+     *  @throws IllegalArgumentException if an element name is <code>null</code>
      */
     public PVAStructure(final String name, final String struct_name, final List<PVAData> elements)
     {
         super(name);
         this.struct_name = struct_name;
         for (PVAData element : elements)
-            if (element.getName().isEmpty())
-                throw new IllegalArgumentException("Structure with unnamed element");
+            if (element.getName() == null)
+                throw new IllegalArgumentException("Structure with null element name");
         this.elements = Collections.unmodifiableList(elements);
     }
 

diff --git a/core/pva/src/test/java/org/epics/pva/data/StructureTest.java b/core/pva/src/test/java/org/epics/pva/data/StructureTest.java
@@ -127,7 +127,10 @@ public void testError()
         // But _elements_ of the structure need names to address them
         try
         {
+            // This is OK, i.e. element names may be empty
             new PVAStructure("", "", new PVADouble(""));
+            // But this must fail, element names must be non-null
+            new PVAStructure("", "", new PVADouble(null));
             fail("Structure elements must be named");
         }
         catch (Exception ex)