[Springframework-cvs] spring/src/org/springframework/web/multipart/commons CommonsMultipartResolver.java,1.16,1.16.4.1

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

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

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

Index: CommonsMultipartResolver.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/multipart/commons/CommonsMultipartResolver.java,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -d -r1.16 -r1.16.4.1
*** CommonsMultipartResolver.java	17 Sep 2005 17:05:32 -0000	1.16
--- CommonsMultipartResolver.java	21 Apr 2006 00:13:50 -0000	1.16.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,
***************
*** 187,191 ****
  		// its own encoding that does not match the default encoding.
  		if (!enc.equals(this.defaultEncoding)) {
! 			fileUpload = new DiskFileUpload();
  			fileUpload.setSizeMax(this.fileUpload.getSizeMax());
  			fileUpload.setSizeThreshold(this.fileUpload.getSizeThreshold());
--- 187,191 ----
  		// its own encoding that does not match the default encoding.
  		if (!enc.equals(this.defaultEncoding)) {
! 			fileUpload = newFileUpload();
  			fileUpload.setSizeMax(this.fileUpload.getSizeMax());
  			fileUpload.setSizeThreshold(this.fileUpload.getSizeThreshold());