Author: rjung
Date: Fri Jul 16 10:58:47 2010
New Revision: 964751
URL: http://svn.apache.org/viewvc?rev=964751&view=rev
Log:
Fix order when listing Webapp loader search URLs.
Backport of r936892 from trunk.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=964751&r1=964750&r2=964751&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 16 10:58:47 2010
@@ -98,12 +98,6 @@ PATCHES PROPOSED TO BACKPORT:
cause confusion. I'd prefer not to invent a new name, but mention the
one that we already have when documenting virtualClasspath.
- Respect configurable search order in getURLs().
- http://svn.apache.org/viewvc?view=revision&revision=936892
-
http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r936892.patch
- +1: rjung, kkolinko, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343
When ChannelException is thrown, remove listener from channel.
http://svn.apache.org/viewvc?view=revision&revision=948402
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=964751&r1=964750&r2=964751&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Fri Jul 16 10:58:47 2010
@@ -1693,19 +1693,30 @@ public class WebappClassLoader
int filesLength = files.length;
int jarFilesLength = jarRealFiles.length;
- int length = filesLength + jarFilesLength + external.length;
+ int externalsLength = external.length;
+ int off = 0;
int i;
try {
- URL[] urls = new URL[length];
- for (i = 0; i < length; i++) {
- if (i < filesLength) {
- urls[i] = getURL(files[i], true);
- } else if (i < filesLength + jarFilesLength) {
- urls[i] = getURL(jarRealFiles[i - filesLength], true);
- } else {
- urls[i] = external[i - filesLength - jarFilesLength];
+ URL[] urls = new URL[filesLength + jarFilesLength +
externalsLength];
+ if (searchExternalFirst) {
+ for (i = 0; i < externalsLength; i++) {
+ urls[i] = external[i];
+ }
+ off = externalsLength;
+ }
+ for (i = 0; i < filesLength; i++) {
+ urls[off + i] = getURL(files[i], true);
+ }
+ off += filesLength;
+ for (i = 0; i < jarFilesLength; i++) {
+ urls[off + i] = getURL(jarRealFiles[i], true);
+ }
+ off += jarFilesLength;
+ if (!searchExternalFirst) {
+ for (i = 0; i < externalsLength; i++) {
+ urls[off + i] = external[i];
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=964751&r1=964750&r2=964751&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jul 16 10:58:47 2010
@@ -56,6 +56,9 @@
replaced, ensure that the new Set-Cookie header overwrites the old
Set-Cookie header. (markt)
</fix>
+ <fix>
+ Fix order when listing Webapp loader search URLs. (rjung)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
