1 files changed, 15 insertions, 2 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java
index 7b935de..eb07828 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java
@@ -20,6 +20,7 @@ package at.knowcenter.wag.egov.egiz.web.servlets;
 import java.io.IOException;

 import java.io.UnsupportedEncodingException;

 import java.net.URL;

+import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.Iterator;

 import java.util.List;

@@ -50,6 +51,8 @@ import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 import at.knowcenter.wag.egov.egiz.exceptions.PDFDocumentException;

 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;

 import at.knowcenter.wag.egov.egiz.exceptions.SettingNotFoundException;

+import at.knowcenter.wag.egov.egiz.pdf.NoSignatureHolder;

+import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;

 import at.knowcenter.wag.egov.egiz.sig.ConnectorFactory;

 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;

 import at.knowcenter.wag.egov.egiz.web.FormFields;

@@ -324,12 +327,22 @@ public class VerifyServlet extends HttpServlet
     ExtractionStage es = new ExtractionStage();

     List signature_holders = es.extractSignatureHolders(dataSource, parameters);

 

-    if (signature_holders.size() == 0)

+    // filter out NoSignatureHolders that are possibly present due to the direct call method extractSignatureHolders() 

+    List filtered_signature_holders = new ArrayList();

+    Iterator it = signature_holders.iterator();

+    while(it.hasNext()) {

+      SignatureHolder current = (SignatureHolder) it.next();

+      if(!(current instanceof NoSignatureHolder)) {

+        filtered_signature_holders.add(current);

+      }

+    }

+    

+    if (filtered_signature_holders.size() == 0)

     {

       throw new PDFDocumentException(206, "PDF document not signed."); //$NON-NLS-1$

     }

 

-    return signature_holders;

+    return filtered_signature_holders;

   }

 

   // TODO obsolete method - remove