[Springframework-cvs] spring/src/org/springframework/web/servlet DispatcherServlet.java, 1.102, 1.103 HandlerExecutionChain.java, 1.8, 1.9

[Arjen J.W. P. <po...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7622/src/org/springframework/web/servlet

Modified Files:
	DispatcherServlet.java HandlerExecutionChain.java 
Log Message:
Improved logging of MVC:
- Added log messages for successful handling of requests
- Reduced some debug statements to trace

Index: HandlerExecutionChain.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/HandlerExecutionChain.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** HandlerExecutionChain.java	23 Jul 2007 11:17:35 -0000	1.8
--- HandlerExecutionChain.java	21 Oct 2008 10:15:42 -0000	1.9
***************
*** 114,116 ****
--- 114,122 ----
  	}
  
+ 	/**
+ 	 * Delegates to the handler's <code>toString()</code>.
+ 	 */
+ 	public String toString() {
+ 		return String.valueOf(handler);
+ 	}
  }

Index: DispatcherServlet.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/DispatcherServlet.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** DispatcherServlet.java	3 Jul 2008 14:02:53 -0000	1.102
--- DispatcherServlet.java	21 Oct 2008 10:15:42 -0000	1.103
***************
*** 29,33 ****
  import java.util.Properties;
  import java.util.Set;
- 
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
--- 29,32 ----
***************
*** 36,40 ****
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
- 
  import org.springframework.beans.BeansException;
  import org.springframework.beans.factory.BeanFactoryUtils;
--- 35,38 ----
***************
*** 781,786 ****
  		if (logger.isDebugEnabled()) {
  			String requestUri = new UrlPathHelper().getRequestUri(request);
! 			logger.debug(
! 					"DispatcherServlet with name '" + getServletName() + "' received request for [" + requestUri + "]");
  		}
  
--- 779,784 ----
  		if (logger.isDebugEnabled()) {
  			String requestUri = new UrlPathHelper().getRequestUri(request);
! 			logger.debug("DispatcherServlet with name '" + getServletName() +
! 					"' processing request for [" + requestUri + "]");
  		}
  
***************
*** 842,847 ****
  		RequestContextHolder.setRequestAttributes(requestAttributes, this.threadContextInheritable);
  
! 		if (logger.isDebugEnabled()) {
! 			logger.debug("Bound request context to thread: " + request);
  		}
  		
--- 840,845 ----
  		RequestContextHolder.setRequestAttributes(requestAttributes, this.threadContextInheritable);
  
! 		if (logger.isTraceEnabled()) {
! 			logger.trace("Bound request context to thread: " + request);
  		}
  		
***************
*** 942,947 ****
  			// Clear request attributes.
  			requestAttributes.requestCompleted();
! 			if (logger.isDebugEnabled()) {
! 				logger.debug("Cleared thread-bound request context: " + request);
  			}
  		}
--- 940,945 ----
  			// Clear request attributes.
  			requestAttributes.requestCompleted();
! 			if (logger.isTraceEnabled()) {
! 				logger.trace("Cleared thread-bound request context: " + request);
  			}
  		}
***************
*** 953,956 ****
--- 951,959 ----
  	 */
  	protected long getLastModified(HttpServletRequest request) {
+ 		if (logger.isDebugEnabled()) {
+ 			String requestUri = new UrlPathHelper().getRequestUri(request);
+ 			logger.debug("DispatcherServlet with name '" + getServletName() +
+ 					"' determining Last-Modified value for [" + requestUri + "]");
+ 		}
  		try {
  			HandlerExecutionChain mappedHandler = getHandler(request, true);
***************
*** 1048,1053 ****
  		while (it.hasNext()) {
  			HandlerMapping hm = (HandlerMapping) it.next();
! 			if (logger.isDebugEnabled()) {
! 				logger.debug("Testing handler map [" + hm  + "] in DispatcherServlet with name '" +
  						getServletName() + "'");
  			}
--- 1051,1056 ----
  		while (it.hasNext()) {
  			HandlerMapping hm = (HandlerMapping) it.next();
! 			if (logger.isTraceEnabled()) {
! 				logger.trace("Testing handler map [" + hm  + "] in DispatcherServlet with name '" +
  						getServletName() + "'");
  			}
***************
*** 1088,1093 ****
  		while (it.hasNext()) {
  			HandlerAdapter ha = (HandlerAdapter) it.next();
! 			if (logger.isDebugEnabled()) {
! 				logger.debug("Testing handler adapter [" + ha + "]");
  			}
  			if (ha.supports(handler)) {
--- 1091,1096 ----
  		while (it.hasNext()) {
  			HandlerAdapter ha = (HandlerAdapter) it.next();
! 			if (logger.isTraceEnabled()) {
! 				logger.trace("Testing handler adapter [" + ha + "]");
  			}
  			if (ha.supports(handler)) {