[Springframework-cvs] spring/src/org/springframework/mail/javamail JavaMailSenderImpl.java,1.22,1.22.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/mail/javamail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/mail/javamail

Modified Files:
      Tag: mbranch-1-2
	JavaMailSenderImpl.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: JavaMailSenderImpl.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/mail/javamail/JavaMailSenderImpl.java,v
retrieving revision 1.22
retrieving revision 1.22.4.1
diff -C2 -d -r1.22 -r1.22.4.1
*** JavaMailSenderImpl.java	12 Sep 2005 20:35:31 -0000	1.22
--- JavaMailSenderImpl.java	21 Apr 2006 00:13:49 -0000	1.22.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 79,83 ****
  	protected final Log logger = LogFactory.getLog(getClass());
  
! 	private Session session = Session.getInstance(new Properties());
  
  	private String protocol = DEFAULT_PROTOCOL;
--- 79,83 ----
  	protected final Log logger = LogFactory.getLog(getClass());
  
! 	private Session session = Session.getInstance(new Properties(), null);
  
  	private String protocol = DEFAULT_PROTOCOL;
***************
*** 117,121 ****
  	 */
  	public void setJavaMailProperties(Properties javaMailProperties) {
! 		this.session = Session.getInstance(javaMailProperties);
  	}
  
--- 117,121 ----
  	 */
  	public void setJavaMailProperties(Properties javaMailProperties) {
! 		this.session = Session.getInstance(javaMailProperties, null);
  	}