fix OA PublicPrefix validation

1 files changed, 22 insertions, 3 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 5a9787069..26d97484b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -291,8 +291,17 @@ public class BasicOAAction extends BasicAction {
 	                
 	            } else {
 	
-	                if (oaid == -1) {
-	                    onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	                if (oaid == -1) {	                		                	
+	                	List<OnlineApplication> oaList = ConfigurationDBRead.getAllOnlineApplications();
+	                	for (OnlineApplication el : oaList) {
+	                		if (el.getPublicURLPrefix().startsWith(oaidentifier) )
+	                		onlineapplication = el;
+	                		
+	                	}
+	                	if (onlineapplication == null) {	                	
+	                		onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	                		
+	                	}
 	                    setNewOA(true);
 	                    if (onlineapplication != null) {
 	                        log.info("The OAIdentifier is not unique");
@@ -306,7 +315,17 @@ public class BasicOAAction extends BasicAction {
 	                    onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid);
 	                    if (!oaidentifier.equals(onlineapplication.getPublicURLPrefix())) {
 	
-	                        if (ConfigurationDBRead.getOnlineApplication(oaidentifier) != null) {
+	                    	OnlineApplication dbOA = null;	                    	
+		                	List<OnlineApplication> oaList = ConfigurationDBRead.getAllOnlineApplications();
+		                	for (OnlineApplication el : oaList) {
+		                		if (el.getPublicURLPrefix().startsWith(oaidentifier) )
+		                		dbOA = el;
+		                		
+		                	}
+	                    	if (dbOA == null)
+	                    		dbOA = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	                    	
+	                        if ( (dbOA != null && !dbOA.getHjid().equals(oaid))) {
 	                        	log.info("The OAIdentifier is not unique");
 	                        	throw new BasicOAActionException(
 	                        			LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request),