1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
index 90625b4..46c9f67 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
@@ -295,10 +295,6 @@ public class EnvelopingBase64MOAConnector implements Connector
       String x509_cert_string = CodingHelper.encodeBase64(der);
       verify_xml = verify_xml.replaceFirst(TemplateReplaces.X509_CERTIFICATE_REPLACE, x509_cert_string);
 
-      // Base64 content replace
-      String base64 = CodingHelper.encodeBase64(data_value);
-      verify_xml = verify_xml.replaceFirst(TemplateReplaces.BASE64_CONTENT_REPLACE, base64);
-
       // Qualified Properties replaces
       verify_xml = verify_xml.replaceFirst(TemplateReplaces.SIGNING_TIME_REPLACE, so.getDate());
       verify_xml = verify_xml.replaceFirst(TemplateReplaces.DIGEST_VALUE_CERTIFICATE_REPLACE, certDigest);
@@ -327,6 +323,10 @@ public class EnvelopingBase64MOAConnector implements Connector
         verify_xml = verify_xml.replaceFirst(TemplateReplaces.DIGEST_VALUE_SIGNED_PROPERTIES_REPLACE, sig_prop_hash);
       }
 
+      // Base64 content replace -> do this at last for performance
+      String base64 = CodingHelper.encodeBase64(data_value);
+      verify_xml = verify_xml.replaceFirst(TemplateReplaces.BASE64_CONTENT_REPLACE, base64);
+      
       log.debug("prepareXMLContent finished."); //$NON-NLS-1$
       return verify_xml;
     }