[Springframework-cvs] spring/src/org/springframework/util StringUtils.java, 1.72, 1.73

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

Update of /cvsroot/springframework/spring/src/org/springframework/util
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22385/src/org/springframework/util

Modified Files:
	StringUtils.java 
Log Message:
fixed "StringUtils.delete" to prevent an eternal loop in case of the pattern being empty

Index: StringUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/util/StringUtils.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** StringUtils.java	1 Sep 2008 23:19:26 -0000	1.72
--- StringUtils.java	22 Oct 2008 09:44:15 -0000	1.73
***************
*** 371,381 ****
  	 */
  	public static String replace(String inString, String oldPattern, String newPattern) {
! 		if (inString == null) {
! 			return null;
! 		}
! 		if (oldPattern == null || newPattern == null) {
  			return inString;
  		}
- 
  		StringBuffer sbuf = new StringBuffer();
  		// output StringBuffer we'll build up
--- 371,377 ----
  	 */
  	public static String replace(String inString, String oldPattern, String newPattern) {
! 		if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) {
  			return inString;
  		}
  		StringBuffer sbuf = new StringBuffer();
  		// output StringBuffer we'll build up
***************
*** 391,395 ****
  		}
  		sbuf.append(inString.substring(pos));
- 
  		// remember to append any characters to the right of a match
  		return sbuf.toString();
--- 387,390 ----