X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyNotificationMail.java;h=895adbe417e609b993a9d091cf2eb75f819e635e;hb=cac5ee759fee5db51a32838c7e25b878468a27e0;hp=a4e4762000665d20f1fc3b8ce7f6b4bc4a7f719f;hpb=3c519a0d908c34e22d724d663ad3512f6cdd8d8f;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
index a4e476200..895adbe41 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
@@ -108,12 +108,15 @@ public class PolicyNotificationMail{
 		}
 		String policyFileName = entityItem.getPolicyName();
 		String checkPolicyName = policyName;
+		if(checkPolicyName.endsWith(".xml") || checkPolicyName.contains(".")){
+			checkPolicyName = checkPolicyName.substring(0, checkPolicyName.indexOf('.'));
+		}
 		if(policyFileName.contains("/")){
-			policyFileName = policyFileName.substring(0, policyFileName.indexOf("/"));
+			policyFileName = policyFileName.substring(0, policyFileName.indexOf('/'));
 			policyFileName = policyFileName.replace("/", File.separator);
 		}
 		if(policyFileName.contains("\\")){
-			policyFileName = policyFileName.substring(0, policyFileName.indexOf("\\"));
+			policyFileName = policyFileName.substring(0, policyFileName.indexOf('\\'));
 			policyFileName = policyFileName.replace("\\", "\\\\");
 		}
 		
@@ -122,7 +125,12 @@ public class PolicyNotificationMail{
 		boolean sendFlag = false;
 		SimpleBindings params = new SimpleBindings();
 		params.put("policyFileName", policyFileName);
-		List<Object> watchList = policyNotificationDao.getDataByQuery(query, params);
+		List<Object> watchList = null;
+		if(PolicyController.isjUnit()){
+			watchList = policyNotificationDao.getDataByQuery(query, null);
+		}else{
+			watchList = policyNotificationDao.getDataByQuery(query, params);
+		}
 		if(watchList != null && !watchList.isEmpty()){
 			for(Object watch : watchList){
 				WatchPolicyNotificationTable list = (WatchPolicyNotificationTable) watch;
@@ -135,11 +143,9 @@ public class PolicyNotificationMail{
 					}
 				}
 				if(sendFlag){
-					AnnotationConfigApplicationContext ctx = null;
-					try {
+					try (AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext()) {
 						to = list.getLoginIds()+"@"+PolicyController.getSmtpEmailExtension();
 						to = to.trim();
-						ctx = new AnnotationConfigApplicationContext();
 						ctx.register(PolicyNotificationMail.class);
 						ctx.refresh();
 						JavaMailSenderImpl mailSender = ctx.getBean(JavaMailSenderImpl.class);
@@ -150,15 +156,11 @@ public class PolicyNotificationMail{
 						mailMsg.setSubject(subject);
 						mailMsg.setText(message);
 						mailSender.send(mimeMessage);
-						if(mode.equalsIgnoreCase("Rename") || mode.contains("Delete") || mode.contains("Move")){
+						if("Rename".equalsIgnoreCase(mode) || mode.contains("Delete") || mode.contains("Move")){
 							policyNotificationDao.delete(watch);
 						}
 					} catch (Exception e) {
 						policyLogger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW+"Exception Occured in Policy Notification" +e);
-					}finally{
-						if(ctx != null){
-							ctx.close();
-						}
 					}
 				}
 			}