tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationContextFacade.java
Date Wed, 30 Apr 2003 16:30:27 GMT
luehe       2003/04/30 09:30:24

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationContextFacade.java
  Log:
  Fixed 4855679: MalformedURLException by ServletContext.getResource() with invalid path
  
  Revision  Changes    Path
  1.7       +19 -12    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
  
  Index: ApplicationContextFacade.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApplicationContextFacade.java	19 Apr 2003 08:29:42 -0000	1.6
  +++ ApplicationContextFacade.java	30 Apr 2003 16:30:24 -0000	1.7
  @@ -533,19 +533,26 @@
        * Throw the real exception.
        * @param ex The current exception
        */
  -    private void handleException(Exception ex, String methodName) throws Throwable{
  +    private void handleException(Exception ex, String methodName)
  +	    throws Throwable {
  +
           Throwable realException;
  -        if (ex instanceof InvocationTargetException){
  -            realException = ((InvocationTargetException)ex).getTargetException();
  -        } else if (ex instanceof PrivilegedActionException){
  -            realException =  ((PrivilegedActionException)ex).getException();
  +
  +        if (sysLog.isDebugEnabled()) {   
  +            sysLog.debug("ApplicationContextFacade." + methodName, ex);
  +        }
  +
  +	if (ex instanceof PrivilegedActionException) {
  +            ex = ((PrivilegedActionException) ex).getException();
  +	}
  +
  +        if (ex instanceof InvocationTargetException) {
  +            realException =
  +		((InvocationTargetException) ex).getTargetException();
           } else {
               realException = ex;
           }   
   
  -        if (sysLog.isDebugEnabled() ){   
  -            sysLog.debug("ApplicationContextFacade." + methodName,ex);
  -        }
           throw realException;
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message