[jbossweb-commits] JBossWeb SVN: r1573 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2010-11-04 13:30:17 -0400 (Thu, 04 Nov 2010)
New Revision: 1573
Modified:
trunk/java/org/apache/naming/resources/ProxyDirContext.java
trunk/webapps/docs/changelog.xml
Log:
- Fix a problem with overlay entries timestamp.
Modified: trunk/java/org/apache/naming/resources/ProxyDirContext.java
===================================================================
--- trunk/java/org/apache/naming/resources/ProxyDirContext.java 2010-11-02 15:40:29 UTC
(rev 1572)
+++ trunk/java/org/apache/naming/resources/ProxyDirContext.java 2010-11-04 17:30:17 UTC
(rev 1573)
@@ -1686,7 +1686,7 @@
if (((!entry.exists)
|| (entry.context != null)
|| ((entry.resource != null)
- && (entry.resource.getContent() != null)))
+ && (entry.resource.getContent() != null || entry.timestamp ==
Long.MAX_VALUE)))
&& (System.currentTimeMillis() < entry.timestamp)) {
return true;
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-11-02 15:40:29 UTC (rev 1572)
+++ trunk/webapps/docs/changelog.xml 2010-11-04 17:30:17 UTC (rev 1573)
@@ -22,6 +22,9 @@
<fix>
<jboss-jira>JBAS-8571</jboss-jira>: Allow a Servlet 3.0 login to
reauthenticate with SSO. (remm)
</fix>
+ <fix>
+ <jira>189</jira>: Overlay timestamps need special treatment. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">