Author: remy.maucherat(a)jboss.com Date: 2010-03-09 08:55:51 -0500 (Tue, 09 Mar 2010) New Revision: 1404 Modified: trunk/java/org/apache/naming/resources/FileDirContext.java trunk/java/org/apache/naming/resources/WARDirContext.java trunk/webapps/docs/changelog.xml Log: - Port 48760: Possible race condition reading resources. Modified: trunk/java/org/apache/naming/resources/FileDirContext.java =================================================================== --- trunk/java/org/apache/naming/resources/FileDirContext.java 2010-03-08 23:07:34 UTC (rev 1403) +++ trunk/java/org/apache/naming/resources/FileDirContext.java 2010-03-09 13:55:51 UTC (rev 1404) @@ -920,7 +920,9 @@ public InputStream streamContent() throws IOException { if (binaryContent == null) { - inputStream = new FileInputStream(file); + FileInputStream fis = new FileInputStream(file); + inputStream = fis; + return fis; } return super.streamContent(); } Modified: trunk/java/org/apache/naming/resources/WARDirContext.java =================================================================== --- trunk/java/org/apache/naming/resources/WARDirContext.java 2010-03-08 23:07:34 UTC (rev 1403) +++ trunk/java/org/apache/naming/resources/WARDirContext.java 2010-03-09 13:55:51 UTC (rev 1404) @@ -938,7 +938,9 @@ throws IOException { try { if (binaryContent == null) { - inputStream = base.getInputStream(entry); + InputStream is = base.getInputStream(entry); + inputStream = is; + return is; } } catch (ZipException e) { throw new IOException(e.getMessage()); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-03-08 23:07:34 UTC (rev 1403) +++ trunk/webapps/docs/changelog.xml 2010-03-09 13:55:51 UTC (rev 1404) @@ -34,6 +34,9 @@ <fix> <bug>48589</bug>: JNDI realm extensibility. (markt) </fix> + <fix> + <bug>48760</bug>: Fix possible race condition reading resources. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote">