1 files changed, 9 insertions, 4 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index dac25ad60..d4e8e957d 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -40,8 +39,6 @@ import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.GeneralMOAIDConfig;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
-import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
-import at.gv.egovernment.moa.id.configuration.validation.CompanyNumberValidator;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
@@ -417,7 +414,7 @@ public class MOAConfigValidator {
 		
 
 		
-		if (form.getFileUploadFileName() != null) {
+		if (form.getFileUploadFileName() != null && !form.getFileUploadFileName().isEmpty()) {
 			HashMap<String, byte[]> map = new HashMap<String, byte[]>();
 			for (int i=0; i<form.getFileUploadFileName().size(); i++) {
 				String filename = form.getFileUploadFileName().get(i);
@@ -442,7 +439,15 @@ public class MOAConfigValidator {
 					}
 				}
 			}
+						
 			form.setSecLayerTransformation(map);
+			
+		} else {
+			if (form.getSecLayerTransformation() == null) {			
+				log.info("AuthBlock Transformation file is empty");
+				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.file.empty", request));
+				
+			}			
 		}