merge

1 files changed, 6 insertions, 3 deletions

diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
index c2bdfa79..a1934cb2 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
+++ b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
@@ -5,6 +5,7 @@ import java.util.UUID;
 
 import javax.activation.DataSource;
 
+import at.asit.pdfover.commons.Profile;
 import at.asit.pdfover.signator.ByteArrayDocumentSource;
 import at.asit.pdfover.signator.SignResult;
 import at.asit.pdfover.signator.SignResultImpl;
@@ -90,6 +91,8 @@ public class PdfAs4Signer implements Signer {
 			param.getConfiguration().setValue(IConfigurationConstants.PLACEHOLDER_MODE, "3");
 			param.getConfiguration().setValue(IConfigurationConstants.PLACEHOLDER_SEARCH_ENABLED, IConfigurationConstants.TRUE);
 		}
+		
+
 
 		
 
@@ -144,6 +147,8 @@ public class PdfAs4Signer implements Signer {
 					sp = new SignaturePosition();
 				else if (tp.isPauto())
 					sp = new SignaturePosition(tp.getPosX(), tp.getPosY());
+				else if (param.getSignatureProfileId().contains(Profile.AMTSSIGNATURBLOCK.getName()))
+					sp = new SignaturePosition();
 				else
 					sp = new SignaturePosition(tp.getPosX(), tp.getPosY(), tp.getPage());
 				result.setSignaturePosition(sp);
@@ -151,9 +156,7 @@ public class PdfAs4Signer implements Signer {
 
 			result.setSignedDocument(new ByteArrayDocumentSource(sstate.getOutput().toByteArray()));
 			return result;
-		} catch (PdfAsException e) {
-			throw new SignatureException(e);
-		} catch (PDFASError e) {
+		} catch (PdfAsException | PDFASError e) {
 			throw new SignatureException(e);
 		}
 	}