Author: markt
Date: Fri Aug 27 21:25:19 2010
New Revision: 990276
URL: http://svn.apache.org/viewvc?rev=990276&view=rev
Log:
Return a copy of the URL being used from the webapp class loader, not the
original.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=990276&r1=990275&r2=990276&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Aug 27 21:25:19 2010
@@ -60,13 +60,6 @@ PATCHES PROPOSED TO BACKPORT:
-0: rjung
rjung: Should we really change default behaviour for a mature version?
-* Return a copy of the URL being used from the webapp class loader, not the
- original.
- It is backport of Mark's r966292.
- http://people.apache.org/~kkolinko/patches/2010-07-22_tc55_getURLs.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Add Null check when CHANGE_SESSION_ID message received.
http://svn.apache.org/viewvc?rev=982877&view=rev
+1: kfujino, markt
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=990276&r1=990275&r2=990276&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Fri Aug 27 21:25:19 2010
@@ -1476,7 +1476,7 @@ public class WebappClassLoader
public URL[] getURLs() {
if (repositoryURLs != null) {
- return repositoryURLs;
+ return (URL[]) repositoryURLs.clone();
}
URL[] external = super.getURLs();
@@ -1505,7 +1505,7 @@ public class WebappClassLoader
repositoryURLs = new URL[0];
}
- return repositoryURLs;
+ return (URL[]) repositoryURLs.clone();
}
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=990276&r1=990275&r2=990276&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Aug 27
21:25:19 2010
@@ -47,6 +47,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Return a copy of the URL being used from the webapp class loader, not
+ the original array. (kkolinko/markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
