Author: jim
Date: Thu Jan 20 19:19:40 2011
New Revision: 1061470
URL: http://svn.apache.org/viewvc?rev=1061470&view=rev
Log:
Merge r1056828 from trunk:
Submitted by: kkolinko
Reviewed/backported by: jim
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061470&r1=1061469&r2=1061470&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:19:40 2011
@@ -32,12 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt, jim
-1:
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
- Additional patch (not important):
- http://svn.apache.org/viewvc?rev=1056828&view=rev
- +1: kkolinko, markt, jim
- -1:
-
* Remove JSSE13Factory, JSSE13SocketFactory classes,
because
- TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java?rev=1061470&r1=1061469&r2=1061470&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Thu Jan 20 19:19:40 2011
@@ -1611,15 +1611,17 @@ public class ProxyDirContext implements
protected boolean cacheUnload(String name) {
if (cache == null)
return false;
+ // To ensure correct operation, particularly of WebDAV, unload
+ // the resource with and without a trailing /
+ String name2;
+ if (name.endsWith("/")) {
+ name2 = name.substring(0, name.length() -1);
+ } else {
+ name2 = name + "/";
+ }
synchronized (cache) {
boolean result = cache.unload(name);
- // To ensure correct operation, particularly of WebDAV, unload
- // the resource with and without a trailing /
- if (name.endsWith("/")) {
- cache.unload(name.substring(0, name.length() -1));
- } else {
- cache.unload(name + "/");
- }
+ cache.unload(name2);
return result;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
