fixed findFieldName method not giving the result more than one time.

Author: mrsafi

forms/src/main/java/com/itextpdf/forms/xfa/XfaForm.java

@@ -55,17 +55,11 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfVersion;
 import com.itextpdf.kernel.pdf.VersionConforming;
 import com.itextpdf.kernel.xmp.XmlDomWriter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -77,6 +71,14 @@ This file is part of the iText (R) project.
 import java.util.HashMap;
 import java.util.Map;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 /**
  * Processes XFA forms.
  */
@@ -331,10 +333,14 @@ public boolean isXfaPresent() {
      * @return the complete name or <CODE>null</CODE> if not found
      */
     public String findFieldName(String name) {
-        if (acroFieldsSom == null && xfaPresent) {
+        if (acroFieldsSom == null && xfaPresent && datasetsSom != null ) {
             acroFieldsSom = new AcroFieldsSearch(datasetsSom.getName2Node().keySet());
+        }
+
+        if (acroFieldsSom != null && xfaPresent) {
             return acroFieldsSom.getAcroShort2LongName().containsKey(name) ? acroFieldsSom.getAcroShort2LongName().get(name) : acroFieldsSom.inverseSearchGlobal(Xml2Som.splitParts(name));
         }
+
         return null;
     }
 

forms/src/test/java/com/itextpdf/forms/xfa/XFAFormTest.java

@@ -49,14 +49,15 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.IntegrationTest;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-
 @Category(IntegrationTest.class)
 public class XFAFormTest extends ExtendedITextTest {
 
@@ -119,5 +120,25 @@ public void readXFAFormTest() throws IOException {
         PdfAcroForm.getAcroForm(pdfDocument, true);
     }
 
+    @Test
+    public void findFieldName() throws IOException {
+        String inFileName = sourceFolder + "TextField1.pdf";
+        PdfDocument pdfDocument = new PdfDocument(new PdfReader(inFileName));
+        PdfAcroForm acroForm = PdfAcroForm.getAcroForm(pdfDocument, true);
+        XfaForm xfaForm = acroForm.getXfaForm();
+        xfaForm.findFieldName("TextField1");
+        String secondRun = xfaForm.findFieldName("TextField1");
+        Assert.assertNotNull(secondRun);
+    }
+
+    @Test
+    public void findFieldNameWithoutDataSet() throws IOException {
+        String inFileName = sourceFolder + "TextField1_empty.pdf";
+        PdfDocument pdfDocument = new PdfDocument(new PdfReader(inFileName));
+        PdfAcroForm acroForm = PdfAcroForm.getAcroForm(pdfDocument, true);
+        XfaForm xfaForm = acroForm.getXfaForm();
+        String name = xfaForm.findFieldName("TextField1");
+        Assert.assertNull(name);
+    }
 
 }