1 files changed, 7 insertions, 5 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java
index d7d83b34..3fe8298b 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateAndRequestParameterResolver.java
@@ -23,6 +23,7 @@
  ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
+import at.gv.egiz.pdfas.common.settings.IProfileConstants;
 import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings;
 import at.gv.egiz.pdfas.common.utils.DNUtils;
 import at.gv.egiz.pdfas.common.utils.OgnlUtils;
@@ -30,26 +31,24 @@ import at.gv.egiz.pdfas.lib.impl.status.OperationStatus;
 import iaik.x509.X509Certificate;
 import ognl.AbstractMemberAccess;
 import ognl.MemberAccess;
-import ognl.Ognl;
 import ognl.OgnlContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.naming.InvalidNameException;
-
 import java.lang.reflect.Member;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
-public class CertificateResolver implements IResolver {
+public class CertificateAndRequestParameterResolver implements IResolver {
 
-    private static final Logger logger = LoggerFactory.getLogger(CertificateResolver.class);
+    private static final Logger logger = LoggerFactory.getLogger(CertificateAndRequestParameterResolver.class);
 
     private OgnlContext ctx;
     private X509Certificate certificate;
 
-    public CertificateResolver(X509Certificate certificate, OperationStatus operationStatus) {
+    public CertificateAndRequestParameterResolver(X509Certificate certificate, OperationStatus operationStatus) {
         this.certificate = certificate;
 
         MemberAccess memberAccess = new AbstractMemberAccess() {
@@ -62,6 +61,9 @@ public class CertificateResolver implements IResolver {
                 
         this.ctx = new OgnlContext(null, null, memberAccess);
 
+        this.ctx = new OgnlContext(null, null, memberAccess);
+        this.ctx.put(IProfileConstants.DYNAMIC_REQUEST_PARAMETERS, operationStatus.getRequestParameters());
+
         this.ctx.put("sn", this.certificate.getSerialNumber().toString());
         
         try {