From b3a42e60ed36f52ce3c8609fd1d5279833339ff1 Mon Sep 17 00:00:00 2001
From: Nick Garay <nicolasgaray@icloud.com>
Date: Fri, 5 Sep 2025 17:08:20 -0400
Subject: [PATCH] Fix XmlDataParser ChoiceReader

---
 .../src/main/java/org/vast/swe/fast/XmlDataParser.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib-ogc/swe-common-core/src/main/java/org/vast/swe/fast/XmlDataParser.java b/lib-ogc/swe-common-core/src/main/java/org/vast/swe/fast/XmlDataParser.java
index 74e01e3bba..08b72800c5 100644
--- a/lib-ogc/swe-common-core/src/main/java/org/vast/swe/fast/XmlDataParser.java
+++ b/lib-ogc/swe-common-core/src/main/java/org/vast/swe/fast/XmlDataParser.java
@@ -307,6 +307,12 @@ public ChoiceReader(DataChoice choice) {
             int i = 0;
             for (DataComponent item : choice.getItemList())
                 itemIndexes.put(item.getName(), i++);
+
+            try {
+                xmlStreamReader.next();
+            } catch (XMLStreamException ignored) {
+
+            }
         }
 
         @Override
@@ -327,7 +333,6 @@ public int process(DataBlock data, int index) throws IOException {
                 // delegate to selected item processor
                 index = super.process(data, index, selectedIndex);
 
-                xmlStreamReader.next();
             } catch (XMLStreamException e) {
                 throw new IOException(e);
             }