1 files changed, 39 insertions, 5 deletions
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 3ca497b..d9549b0 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
@@ -413,11 +413,12 @@ public class VerificationFilterImpl implements VerificationFilter
       {
         assert partitionResult.size() >= prevPartitionResult.size();
 
-        for (int i = prevPartitionResult.size(); i < partitionResult.size(); i++)
-        {
-          SignatureHolder sh = (SignatureHolder) partitionResult.get(i);
-          extractedSignatures.add(sh);
-        }
+//        for (int i = prevPartitionResult.size(); i < partitionResult.size(); i++)
+//        {
+//          SignatureHolder sh = (SignatureHolder) partitionResult.get(i);
+//          extractedSignatures.add(sh);
+//        }
+        mergeSignatures(prevPartitionResult, partitionResult, extractedSignatures);
       }
 
       prevPartitionResult = partitionResult;
@@ -436,6 +437,39 @@ public class VerificationFilterImpl implements VerificationFilter
     return signatureHolderChain;
   }
   
+  private void mergeSignatures(List oldList, List newList, List result) {
+    
+    for(int i=0; i < newList.size(); i++) {
+      
+      SignatureHolder currentNewSh = (SignatureHolder)newList.get(i);
+      
+      boolean shAlreadyPresentInOldList = false;
+      int pos = -1;
+      
+      for(int j=0; j<oldList.size(); j++) {
+        
+        SignatureHolder currentOldSh = (SignatureHolder)oldList.get(j);
+        
+        if(currentNewSh.getSignatureObject().getSignationValue().equals(currentOldSh.getSignatureObject().getSignationValue())) {
+          
+          shAlreadyPresentInOldList = true;
+          pos = j;
+        }
+      }
+      
+      if(!shAlreadyPresentInOldList) {
+        
+        // signature holder has not been found earlier -> add
+        result.add(currentNewSh);
+      }
+      
+    }
+    
+  
+    return;
+  }
+  
+  
   protected List flattenOutTextPartitions (List partitions, List blocks)
   {