Author: remy.maucherat(a)jboss.com
Date: 2009-11-23 20:52:45 -0500 (Mon, 23 Nov 2009)
New Revision: 1287
Modified:
trunk/java/org/apache/catalina/session/ManagerBase.java
trunk/java/org/apache/naming/NamingContext.java
trunk/webapps/docs/changelog.xml
Log:
- Port two minor fixes.
Modified: trunk/java/org/apache/catalina/session/ManagerBase.java
===================================================================
--- trunk/java/org/apache/catalina/session/ManagerBase.java 2009-11-23 13:00:24 UTC (rev
1286)
+++ trunk/java/org/apache/catalina/session/ManagerBase.java 2009-11-24 01:52:45 UTC (rev
1287)
@@ -701,6 +701,14 @@
public void destroy() {
if( oname != null )
Registry.getRegistry(null, null).unregisterComponent(oname);
+ if (randomIS!=null) {
+ try {
+ randomIS.close();
+ } catch (IOException ioe) {
+ log.warn("Failed to close randomIS.");
+ }
+ randomIS=null;
+ }
initialized=false;
oname = null;
}
Modified: trunk/java/org/apache/naming/NamingContext.java
===================================================================
--- trunk/java/org/apache/naming/NamingContext.java 2009-11-23 13:00:24 UTC (rev 1286)
+++ trunk/java/org/apache/naming/NamingContext.java 2009-11-24 01:52:45 UTC (rev 1287)
@@ -466,7 +466,7 @@
if (name.size() > 1) {
if (entry.type == NamingEntry.CONTEXT) {
- ((Context) entry.value).unbind(name.getSuffix(1));
+ ((Context) entry.value).destroySubcontext(name.getSuffix(1));
} else {
throw new NamingException
(sm.getString("namingContext.contextExpected"));
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-11-23 13:00:24 UTC (rev 1286)
+++ trunk/webapps/docs/changelog.xml 2009-11-24 01:52:45 UTC (rev 1287)
@@ -140,8 +140,17 @@
<jboss-jira>JBAS-7159</jboss-jira>: Better usability for Context
level usage of RewriteValve. (remm)
</fix>
<fix>
+ Reset strings for query string and host name in RewriteValve when rewriting.
(remm)
+ </fix>
+ <fix>
<jira>148</jira>: Add additional null checks for unmapped contexts.
(remm)
</fix>
+ <fix>
+ <bug>48049</bug>: Fix NamingContext.destroySubcontext. (markt)
+ </fix>
+ <fix>
+ <bug>47718</bug>: Resource leak when using the random stream,
submitted by George Sexton. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
Show replies by date