X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyManagerServlet.java;h=2c67b451e44becd71a5d16de0b9ed5b5c68a5973;hb=528605fe8efa3631291de0b9bf8e498bdbd0c23f;hp=cb373a1bdbcdee94ca9c9313a1bc851e09822dcd;hpb=aa9e865ccf191e814b50b8b4b51d516fc359d948;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
index cb373a1bd..2c67b451e 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
@@ -227,24 +227,24 @@ public class PolicyManagerServlet extends HttpServlet {
 				if (!item.isFormField()) {
 					// Process form file field (input type="file").
 					files.put(item.getName(), item.getInputStream());
-					if(item.getName().endsWith(".xls")){
-						OutputStream outputStream = null;
-						try{
-							File file = new File(item.getName());
-							outputStream = new FileOutputStream(file);
+					if(item.getName().endsWith(".xls") && item.getSize() <= PolicyController.getFileSizeLimit()){
+						File file = new File(item.getName());
+						try (OutputStream outputStream = new FileOutputStream(file);)
+						{
 							IOUtils.copy(item.getInputStream(), outputStream);
-							outputStream.close();
 							newFile = file.toString();
 							PolicyExportAndImportController importController = new PolicyExportAndImportController();
 							importController.importRepositoryFile(newFile, request);
 						}catch(Exception e){
 							LOGGER.error("Upload error : " + e);
-						}finally{
-							if(outputStream != null){
-								outputStream.close();
-							}
 						}
 					}
+					else if (!item.getName().endsWith(".xls")) {
+						LOGGER.error("Non .xls filetype uploaded: " + item.getName());
+					} 
+					else { //uploaded file size is greater than allowed 
+						LOGGER.error("Upload file size limit exceeded! File size (Bytes) is: " + item.getSize());
+					}
 				}
 			}
 
@@ -1448,7 +1448,7 @@ public class PolicyManagerServlet extends HttpServlet {
 				policyAdapter.setReadOnly(false);
 				policyAdapter.setEditPolicy(true);
 			}
-			policyAdapter.setDomain(domain);
+			
 			policyAdapter.setDomainDir(domain);
 			policyAdapter.setPolicyData(policy);
 			String policyName = path.replace(".xml", "");