svn commit: r1624967 - in /syncope/trunk: ./ core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java

[ilgrosso]

Author: ilgrosso
Date: Mon Sep 15 08:24:57 2014
New Revision: 1624967

URL: http://svn.apache.org/r1624967
Log:
[SYNCOPE-547] Merge from 1_2_X

Modified:
    syncope/trunk/   (props changed)
    
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1624963-1624966

Modified: 
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java?rev=1624967&r1=1624966&r2=1624967&view=diff
==============================================================================
--- 
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java
 (original)
+++ 
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java
 Mon Sep 15 08:24:57 2014
@@ -99,7 +99,7 @@ public class NotificationJob implements 
         if (mailSender instanceof JavaMailSenderImpl
                 && StringUtils.isNotBlank(((JavaMailSenderImpl) 
mailSender).getUsername())) {
 
-            Properties javaMailProperties = new Properties();
+            Properties javaMailProperties = ((JavaMailSenderImpl) 
mailSender).getJavaMailProperties();
             javaMailProperties.setProperty("mail.smtp.auth", "true");
             ((JavaMailSenderImpl) 
mailSender).setJavaMailProperties(javaMailProperties);
         }