Reload MOAMetadataProvider after config changes

1 files changed, 37 insertions, 1 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index f160e3e51..cd34d382b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.math.BigInteger;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,6 +20,7 @@ import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
+import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAKeyBoxSelector;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
@@ -297,7 +299,9 @@ ServletResponseAware {
 								
 				if (!authUser.isAdmin()) {
 					onlineapplication.setIsAdminRequired(true);
+					
 				}
+					
 				
 			} else {
 				if (!authUser.isAdmin() && 
@@ -332,6 +336,22 @@ ServletResponseAware {
 					} catch (ConfigurationException e) {
 						log.warn("Sending Mail to User " + userdb.getMail() + " failed", e);
 					}
+				}	
+			}
+			
+			if (pvp2OA.getMetaDataURL() != null) {
+				
+				try {
+					if (newentry ||	!pvp2OA.getMetaDataURL()
+							.equals(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
+					
+						MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
+						moaconfig.setPvp2RefreshItem(new Date());
+						ConfigurationDBUtils.saveOrUpdate(moaconfig);
+					
+					}
+				} catch (Throwable e) {
+					log.info("Found no MetadataURL in OA-Databaseconfig!", e);
 				}
 				
 			}
@@ -348,6 +368,8 @@ ServletResponseAware {
 			}
 		}
 		
+		
+		
 
 		Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);	
 		if (nextPageAttr != null && nextPageAttr instanceof String) {
@@ -479,8 +501,22 @@ ServletResponseAware {
 		}
 			
 		OnlineApplication onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
-				
 		request.getSession().setAttribute(Constants.SESSION_OAID, null);
+		
+		
+		try {
+			if (MiscUtil.isNotEmpty(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
+			
+				MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
+				moaconfig.setPvp2RefreshItem(new Date());
+				ConfigurationDBUtils.saveOrUpdate(moaconfig);
+			
+			}
+		} catch (Throwable e) {
+			log.info("Found no MetadataURL in OA-Databaseconfig!", e);
+		}
+		
+		
 		if (ConfigurationDBUtils.delete(onlineapplication)) {
 			
 			if (!authUser.isAdmin()) {