1 files changed, 10 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
index 07c9f5eda..4be1a81de 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
@@ -40,6 +40,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentOA
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OAPVP2;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
+import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OAPVP2ConfigValidation;
 import at.gv.egovernment.moa.util.Base64Utils;
@@ -58,6 +59,8 @@ public class OAPVP2Config implements IOnlineApplicationData{
 	private String fileUploadContentType;
 	private String fileUploadFileName;
 	
+	private byte[] storedCert = null;
+	
 	public OAPVP2Config() {
 	}
 	
@@ -90,7 +93,9 @@ public class OAPVP2Config implements IOnlineApplicationData{
             if (getFileUpload() != null) { 
             	pvp2.setCertificate(getCertificate());
             	setReLoad(true);
-            }
+            	
+            } else if (storedCert != null)
+            	pvp2.setCertificate(storedCert);
 
         } catch (CertificateException e) {
             log.info("Uploaded Certificate can not be found", e);
@@ -175,6 +180,10 @@ public class OAPVP2Config implements IOnlineApplicationData{
 		return x509.getEncoded();
 	}
 	
+	public void setStoredCert(byte[] storedCert) {
+		this.storedCert = storedCert;
+	}
+
 	public String getMetaDataURL() {
 		return metaDataURL;
 	}