luehe 2003/02/11 13:43:59 Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java jasper2/src/share/org/apache/jasper/runtime PageContextImpl.java jasper2/src/share/org/apache/jasper/servlet JspServletWrapper.java Log: Fixed 16727: Incorrect exception raised when tag file uses jsp:invoke to store result of fragment into session scope and calling page doesn't participate in a session. Revision Changes Path 1.162 +5 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java Index: Generator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- Generator.java 8 Feb 2003 00:06:40 -0000 1.161 +++ Generator.java 11 Feb 2003 21:43:58 -0000 1.162 @@ -3132,6 +3132,8 @@ out.printil( " throw (javax.servlet.jsp.SkipPageException) t;" ); out.printil( "if( t instanceof java.io.IOException )" ); out.printil( " throw (java.io.IOException) t;" ); + out.printil( "if( t instanceof IllegalStateException )" ); + out.printil( " throw (IllegalStateException) t;" ); out.printil( "if( t instanceof javax.servlet.jsp.JspException )" ); out.printil( " throw (javax.servlet.jsp.JspException) t;" ); out.printil("throw new javax.servlet.jsp.JspException(t);" ); 1.42 +7 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java Index: PageContextImpl.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- PageContextImpl.java 8 Feb 2003 00:59:31 -0000 1.41 +++ PageContextImpl.java 11 Feb 2003 21:43:58 -0000 1.42 @@ -283,7 +283,7 @@ case SESSION_SCOPE: if (session == null) { - throw new IllegalArgumentException( + throw new IllegalStateException( Localizer.getMessage("jsp.error.page.noSession")); } return session.getAttribute(name); @@ -326,7 +326,7 @@ case SESSION_SCOPE: if (session == null) { - throw new IllegalArgumentException( + throw new IllegalStateException( Localizer.getMessage("jsp.error.page.noSession")); } session.setAttribute(name, o); @@ -356,7 +356,7 @@ case SESSION_SCOPE: if (session == null) { - throw new IllegalArgumentException( + throw new IllegalStateException( Localizer.getMessage("jsp.error.page.noSession")); } session.removeAttribute(name); @@ -418,7 +418,7 @@ case SESSION_SCOPE: if (session == null) { - throw new IllegalArgumentException( + throw new IllegalStateException( Localizer.getMessage("jsp.error.page.noSession")); } return session.getAttributeNames(); 1.27 +5 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java Index: JspServletWrapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- JspServletWrapper.java 10 Feb 2003 16:38:59 -0000 1.26 +++ JspServletWrapper.java 11 Feb 2003 21:43:59 -0000 1.27 @@ -363,9 +363,8 @@ throw ex; } catch (IOException ex) { throw ex; - // Jikes won't compile this ( JasperException extends ServletException - //} catch (JasperException ex) { - // throw ex; + } catch (IllegalStateException ex) { + throw ex; } catch (Exception ex) { throw new JasperException(ex); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]