cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java

2005-08-25 Thread remm 
remm2005/08/25 05:32:31

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
  Log:
  - Cleanup.
  - Remove useless cast, as suggested by Jan Luehe.
  
  Revision  ChangesPath
  1.26  +2 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- StandardHostValve.java18 Aug 2005 13:25:18 -  1.25
  +++ StandardHostValve.java25 Aug 2005 12:32:30 -  1.26
  @@ -177,8 +177,7 @@
   if (log.isDebugEnabled()) {
   log.debug
   (sm.getString(standardHost.clientAbort,
  -((ClientAbortException) realError).getCause()
  -.getMessage()));
  +realError.getCause().getMessage()));
   }
   return;
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java

2004-05-26 Thread yoavs 
yoavs   2004/05/26 08:41:14

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
  Log:
  Minor JavaDoc fixes (Bugzilla 11212)
  
  Revision  ChangesPath
  1.19  +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- StandardHostValve.java13 Apr 2004 00:28:07 -  1.18
  +++ StandardHostValve.java26 May 2004 15:41:14 -  1.19
  @@ -165,7 +165,7 @@
*
* @param request The request being processed
* @param response The response being generated
  - * @param exception The exception that occurred (which possibly wraps
  + * @param throwable The exception that occurred (which possibly wraps
*  a root cause exception
*/
   protected void throwable(Request request, Response response,
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java

2004-04-12 Thread markt 
markt   2004/04/12 13:30:42

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
  Log:
  - Fix bug 13924. The spec states if an error page declaration doesn't match the 
original exception
and the exception is an instance of ServletException then the exception should be 
unwrapped
and a second pass made of the error page declarations.
  - Ported from TC4.
  
  Revision  ChangesPath
  1.17  +6 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- StandardHostValve.java27 Feb 2004 14:58:42 -  1.16
  +++ StandardHostValve.java12 Apr 2004 20:30:40 -  1.17
  @@ -192,7 +192,11 @@
   return;
   }
   
  -ErrorPage errorPage = findErrorPage(context, realError);
  +ErrorPage errorPage = findErrorPage(context, throwable);
  +
  +if ((errorPage == null)  (throwable instanceof ServletException)) {
  +errorPage = findErrorPage(context, realError);
  +}
   
   if (errorPage != null) {
   response.setAppCommitted(false);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java

2004-04-12 Thread luehe 
luehe   2004/04/12 17:28:07

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
  Log:
  Small optimization of Mark's patch: Avoid repeated call to findErrorPage() if 
'realError' and 'throwable' are identical ('realError' may be different from 
'throwable' only if 'throwable' is an instance of ServletException)
  
  Revision  ChangesPath
  1.18  +2 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StandardHostValve.java12 Apr 2004 20:30:40 -  1.17
  +++ StandardHostValve.java13 Apr 2004 00:28:07 -  1.18
  @@ -193,8 +193,7 @@
   }
   
   ErrorPage errorPage = findErrorPage(context, throwable);
  -
  -if ((errorPage == null)  (throwable instanceof ServletException)) {
  +if ((errorPage == null)  (realError != throwable)) {
   errorPage = findErrorPage(context, realError);
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java

2004-01-21 Thread remm 
remm2004/01/21 02:47:53

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
  Log:
  - New endAccess method, used to fix bug 26051.
  
  Revision  ChangesPath
  1.13  +11 -5 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- StandardHostValve.java6 Nov 2003 23:43:18 -   1.12
  +++ StandardHostValve.java21 Jan 2004 10:47:53 -  1.13
  @@ -182,10 +182,11 @@
   // Update the session last access time for our session (if any)
   HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
   String sessionId = hreq.getRequestedSessionId();
  +Session session = null;
   if (sessionId != null) {
   Manager manager = context.getManager();
   if (manager != null) {
  -Session session = manager.findSession(sessionId);
  +session = manager.findSession(sessionId);
   if (session != null)
   session.access();
   }
  @@ -205,6 +206,11 @@
   status(request, response);
   }
   
  +// Release the session
  +if (session != null)
  +session.endAccess();
  +
  +// Restore the context classloader
   Thread.currentThread().setContextClassLoader
   (StandardHostValve.class.getClassLoader());
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java StandardWrapperValve.java

2003-08-16 Thread remm 
remm2003/08/16 06:43:43

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java StandardWrapperValve.java
  Log:
  - Fix client abort logging.
  - Log client abort exceptions as debug.
  
  Revision  ChangesPath
  1.9   +14 -7 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StandardHostValve.java19 Jul 2003 14:33:29 -  1.8
  +++ StandardHostValve.java16 Aug 2003 13:43:43 -  1.9
  @@ -73,6 +73,10 @@
   import javax.servlet.ServletResponse;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  +
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
  +
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
   import org.apache.catalina.Globals;
  @@ -108,6 +112,8 @@
   extends ValveBase {
   
   
  +private static Log log = LogFactory.getLog(StandardHostValve.class);
  +
   // - Instance Variables
   
   
  @@ -234,9 +240,10 @@
   
   // If this is an aborted request from a client just log it and return
   if (realError instanceof ClientAbortException ) {
  -log(sm.getString(
  -standardHost.clientAbort,
  -((ClientAbortException)realError).getThrowable().getMessage()));
  +log.debug
  +(sm.getString(standardHost.clientAbort,
  +  ((ClientAbortException) realError).getThrowable()
  +  .getMessage()));
   return;
   }
   
  
  
  
  1.21  +17 -7 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
  
  Index: StandardWrapperValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- StandardWrapperValve.java 5 Aug 2003 18:41:50 -   1.20
  +++ StandardWrapperValve.java 16 Aug 2003 13:43:43 -  1.21
  @@ -71,6 +71,13 @@
   import javax.servlet.UnavailableException;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  +
  +import org.apache.commons.beanutils.PropertyUtils;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
  +
  +import org.apache.tomcat.util.buf.MessageBytes;
  +
   import org.apache.catalina.Context;
   import org.apache.catalina.Globals;
   import org.apache.catalina.HttpRequest;
  @@ -78,13 +85,10 @@
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.ValveContext;
  +import org.apache.catalina.connector.ClientAbortException;
   import org.apache.catalina.deploy.FilterDef;
   import org.apache.catalina.util.StringManager;
   import org.apache.catalina.valves.ValveBase;
  -import org.apache.tomcat.util.buf.MessageBytes;
  -import org.apache.commons.beanutils.PropertyUtils;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /**
* Valve that implements the default basic behavior for the
  @@ -254,6 +258,10 @@
   filterChain.doFilter(hreq, hres);
   }
   hreq.removeAttribute(Globals.JSP_FILE_ATTR);
  +} catch (ClientAbortException e) {
  +hreq.removeAttribute(Globals.JSP_FILE_ATTR);
  +throwable = e;
  +exception(request, response, e);
   } catch (IOException e) {
   hreq.removeAttribute(Globals.JSP_FILE_ATTR);
   log(sm.getString(standardWrapper.serviceException,
  @@ -304,8 +312,10 @@
   }
   } while (rootCauseCheck != null);
   
  -log(sm.getString(standardWrapper.serviceException,
  - wrapper.getName()), rootCause);
  +if (!(rootCause instanceof ClientAbortException)) {
  +log(sm.getString(standardWrapper.serviceException,
  + wrapper.getName()), rootCause);
  +}
   throwable = e;
   exception(request, response, e);
   } catch (Throwable e) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java

2003-07-19 Thread remm 
remm2003/07/19 07:33:29

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
  Log:
  - Forgot one small patch.
  - Add my name to the author list, from the ErrorDispatcherValve.
  
  Revision  ChangesPath
  1.8   +2 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StandardHostValve.java19 Jul 2003 14:30:07 -  1.7
  +++ StandardHostValve.java19 Jul 2003 14:33:29 -  1.8
  @@ -100,6 +100,7 @@
* when processing HTTP requests.
*
* @author Craig R. McClanahan
  + * @author Remy Maucherat
* @version $Revision$ $Date$
*/
   
  @@ -234,7 +235,7 @@
   // If this is an aborted request from a client just log it and return
   if (realError instanceof ClientAbortException ) {
   log(sm.getString(
  -errorDispatcherValve.clientAbort,
  +standardHost.clientAbort,
   ((ClientAbortException)realError).getThrowable().getMessage()));
   return;
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostValve.java

2003-04-04 Thread costin 
costin  2003/04/04 19:57:58

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
  Log:
  Avoid NPE
  
  Revision  ChangesPath
  1.3   +13 -7 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StandardHostValve.java13 Mar 2003 02:26:32 -  1.2
  +++ StandardHostValve.java5 Apr 2003 03:57:58 -   1.3
  @@ -145,6 +145,8 @@
   throws IOException, ServletException {
   
   // Validate the request and response object types
  +// XXX This should move to Engine ( the entry point )
  +// will it be skiped if the mapper maps the valve ? 
   if (!(request.getRequest() instanceof HttpServletRequest) ||
   !(response.getResponse() instanceof HttpServletResponse)) {
   return; // NOTE - Not much else we can do generically
  @@ -161,9 +163,13 @@
   }
   
   // Bind the context CL to the current thread
  -Thread.currentThread().setContextClassLoader
  -(context.getLoader().getClassLoader());
  -
  +if( context.getLoader() != null ) {
  +// Not started - it should check for availability first
  +// This should eventually move to Engine, it's generic.
  +Thread.currentThread().setContextClassLoader
  +(context.getLoader().getClassLoader());
  +}
  +
   // Update the session last access time for our session (if any)
   HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
   String sessionId = hreq.getRequestedSessionId();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]