[jbossweb-commits] JBossWeb SVN: r425 - in trunk: java/org/apache/jasper/runtime and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2008-02-14 08:31:54 -0500 (Thu, 14 Feb 2008)
New Revision: 425
Modified:
trunk/java/org/apache/catalina/session/ManagerBase.java
trunk/java/org/apache/jasper/runtime/PageContextImpl.java
trunk/webapps/docs/changelog.xml
trunk/webapps/docs/project.xml
Log:
- Remove synced call.
- Fix possible NPE.
Modified: trunk/java/org/apache/catalina/session/ManagerBase.java
===================================================================
--- trunk/java/org/apache/catalina/session/ManagerBase.java 2008-02-14 13:08:39 UTC (rev
424)
+++ trunk/java/org/apache/catalina/session/ManagerBase.java 2008-02-14 13:31:54 UTC (rev
425)
@@ -679,7 +679,7 @@
if(log.isDebugEnabled())
log.debug("Start expire sessions " + getName() + " at " +
timeNow + " sessioncount " + sessions.length);
for (int i = 0; i < sessions.length; i++) {
- if (!sessions[i].isValid()) {
+ if (sessions[i] != null && !sessions[i].isValid()) {
expireHere++;
}
}
Modified: trunk/java/org/apache/jasper/runtime/PageContextImpl.java
===================================================================
--- trunk/java/org/apache/jasper/runtime/PageContextImpl.java 2008-02-14 13:08:39 UTC (rev
424)
+++ trunk/java/org/apache/jasper/runtime/PageContextImpl.java 2008-02-14 13:31:54 UTC (rev
425)
@@ -70,6 +70,8 @@
*/
public class PageContextImpl extends PageContext {
+ private static JspFactory jspf = JspFactory.getDefaultFactory();
+
private BodyContentImpl[] outs;
private int depth;
@@ -895,7 +897,7 @@
final ProtectedFunctionMapper functionMap, final boolean escape)
throws ELException {
Object retValue;
- final ExpressionFactory exprFactory =
JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
+ final ExpressionFactory exprFactory =
jspf.getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
retValue = AccessController
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-02-14 13:08:39 UTC (rev 424)
+++ trunk/webapps/docs/changelog.xml 2008-02-14 13:31:54 UTC (rev 425)
@@ -149,6 +149,9 @@
<fix>
Ignore not found readme and xslt in DefaultServlet. (remm)
</fix>
+ <fix>
+ Fix possible NPE processing session expires. (fhanik)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -212,6 +215,9 @@
Finish removing of some URL CL hardcoding. If parent CL is not a URL CL, the Ant
classpath cannot
be generated, and security setup might be incomplete. (remm)
</fix>
+ <fix>
+ <bug>44408</bug>: Remove useless synchronization. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
Modified: trunk/webapps/docs/project.xml
===================================================================
--- trunk/webapps/docs/project.xml 2008-02-14 13:08:39 UTC (rev 424)
+++ trunk/webapps/docs/project.xml 2008-02-14 13:31:54 UTC (rev 425)
@@ -29,7 +29,7 @@
<item name="PHP" href="php.html"/>
<item name="SSI"
href="ssi-howto.html"/>
<item name="CGI"
href="cgi-howto.html"/>
- <item name="Rewrite Support"
href="rewrite.html"/>
+ <item name="URL Rewriting"
href="rewrite.html"/>
<item name="Proxy Support"
href="proxy-howto.html"/>
<item name="MBean Descriptor"
href="mbeans-descriptor-howto.html"/>
<item name="Default Servlet"
href="default-servlet.html"/>