X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Fatt%2Fdmf%2Fmr%2Futils%2FEmailer.java;h=1b682169d3244987e092bb85687c408158529d78;hb=3c077fdac44a644167b246ed4e0377603f54804d;hp=a940abf028dfef5b3d09fdb4de8f6a96999a421f;hpb=7a6339681d0930aac1848d2f4770ba0935102708;p=dmaap%2Fmessagerouter%2Fmsgrtr.git

diff --git a/src/main/java/com/att/dmf/mr/utils/Emailer.java b/src/main/java/com/att/dmf/mr/utils/Emailer.java
index a940abf..1b68216 100644
--- a/src/main/java/com/att/dmf/mr/utils/Emailer.java
+++ b/src/main/java/com/att/dmf/mr/utils/Emailer.java
@@ -89,7 +89,6 @@ public class Emailer
 	private static final EELFLogger log = EELFManager.getInstance().getLogger(Emailer.class);
 	
 	public static final String kSetting_MailAuthUser = "mailLogin";
-	public static final String kSetting_MailAuthPwd = "mailPassword";
 	public static final String kSetting_MailFromEmail = "mailFromEmail";
 	public static final String kSetting_MailFromName = "mailFromName";
 	public static final String kSetting_SmtpServer = "mailSmtpServer";
@@ -162,14 +161,14 @@ public class Emailer
 				makeSetting ( prop, "mail.smtp.starttls.enable", kSetting_SmtpServerSsl, true );
 
 				final String un = getSetting ( kSetting_MailAuthUser, "" );
-				final String pw = getSetting ( kSetting_MailAuthPwd, "" );
+				final String value=(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"mailPassword")!=null)?AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"mailPassword"):"";
 				final Session session = Session.getInstance ( prop,
 					new javax.mail.Authenticator()
 					{
 						@Override
 						protected PasswordAuthentication getPasswordAuthentication()
 						{
-							return new PasswordAuthentication ( un, pw );
+							return new PasswordAuthentication ( un, value );
 						}
 					}
 				);