2 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index f0c85d4..ce6f776 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -47,6 +47,7 @@ import at.gv.egiz.pdfas.impl.vfilter.VerificationFilterParametersImpl;
 import at.knowcenter.wag.egov.egiz.PdfAS;
 import at.knowcenter.wag.egov.egiz.PdfASID;
 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.SignatureException;
 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;
@@ -369,6 +370,12 @@ public class PdfAsObject implements PdfAs
     CheckHelper.checkVerifyAfterAnalysisParameters(verifyAfterAnalysisParameters);
 
     List signatures = verifyAfterAnalysisParameters.getAnalyzeResult().getSignatures();
+    
+    // added by tknall
+    if (signatures == null || signatures.isEmpty()) {
+       throw new PDFDocumentException(ErrorCode.DOCUMENT_NOT_SIGNED, "PDF document not signed."); //$NON-NLS-1$
+    }
+    
     List signature_holders = new ArrayList(signatures.size());
     Iterator it = signatures.iterator();
     while (it.hasNext())
diff --git a/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java b/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
index 81b0364..d353b9a 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
@@ -135,12 +135,10 @@ public class VerificationFilterImpl implements VerificationFilter
 
     }
     
-    log.trace("extractSignaturHolders finished.");
+    log.trace("extractSignaturHolders finished (" + (signatureHolderChain != null ? signatureHolderChain.size() : 0) + " elements).");
     sw.stop();
     log.debug("extractSignatureHolders: " + sw.getTime() + "ms.");
     
-    
-    
     return signatureHolderChain;
   }