Merge pull request apache#2199 from sramazzina/2191

fix apache#2191
hansva · Jan 26, 2023 · 69e79d6 · 69e79d6
2 parents 79bd86e + 640bcc2
commit 69e79d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/core/src/main/java/org/apache/hop/metadata/serializer/xml/XmlMetadataUtil.java b/core/src/main/java/org/apache/hop/metadata/serializer/xml/XmlMetadataUtil.java
@@ -17,12 +17,6 @@
 
 package org.apache.hop.metadata.serializer.xml;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hop.core.Const;
 import org.apache.hop.core.encryption.Encr;
@@ -41,6 +35,13 @@
 import org.apache.hop.metadata.util.ReflectionUtil;
 import org.w3c.dom.Node;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 public class XmlMetadataUtil {
   /**
    * This method looks at the fields in the class of the provided object. It then sees which fields
@@ -538,7 +539,7 @@ private static Object deSerializeFromXml(
       //
       List<Object> list = new ArrayList<>();
       List<Node> itemNodes = XmlHandler.getNodes(groupNode, tag);
-      if (inlineListTags.length > 0) {
+      if (inlineListTags.length > 0 && itemNodes.size() > 0) {
         // Old XML serialization format where everything is just dumped into the same tag.
         // See also HopMetadataProperty.inlineListTags
         //

diff --git a/...esources/org/apache/hop/pipeline/transforms/excelinput/messages/messages_en_US.properties b/...esources/org/apache/hop/pipeline/transforms/excelinput/messages/messages_en_US.properties
@@ -72,7 +72,7 @@ ExcelInputDialog.AcceptField.Label=Field in the input to use as filename
 ExcelInputDialog.AcceptField.Tooltip=Specify the field in the input rows to use as filename
 ExcelInputDialog.AcceptFilenames.Label=Accept filenames from previous transform
 ExcelInputDialog.AcceptFilenames.Tooltip=Enable this if you define the filenames in another transform\nand want this transform to accept those filenames
-ExcelInputDialog.AcceptTransform.Label=transform to read filenames from
+ExcelInputDialog.AcceptTransform.Label=Transform to read filenames from
 ExcelInputDialog.AcceptTransform.Tooltip=Select the transform to read the filename information from
 ExcelInputDialog.AcceptingGroup.Label=Accept filenames from previous transforms
 ExcelInputDialog.AddFields=Add Field(s)

diff --git a/...esources/org/apache/hop/pipeline/transforms/excelinput/messages/messages_it_IT.properties b/...esources/org/apache/hop/pipeline/transforms/excelinput/messages/messages_it_IT.properties
@@ -95,7 +95,7 @@ ExcelInputDialog.InclSheetRownumField.Label=Campo n\u00B0 riga foglio
 ExcelInput.Warning.MissingFiles=ATTENZIONE\: manca {0}
 ExcelInputDialog.ErrorDialog.UnableToGetInputFields.Title=Impossibile prelevare i campi
 ExcelInput.Log.OpeningFile=Apertura file \#{0}
-ExcelInputDialog.AcceptTransform.Label=Passo da cui leggere i nomi di file
+ExcelInputDialog.AcceptTransform.Label=Transform da cui leggere i nomi di file
 ExcelInput.Exception.InvalidTypeLabel=Tipo Etichetta invalido\: {0}, atteso {1}
 ExcelInputDialog.InclSheetnameField.Label=Campo del nome foglio
 ExcelInputDialog.Required.Column=Richiesto