Author: violetagg
Date: Wed Mar 23 07:57:01 2016
New Revision: 1736281
URL: http://svn.apache.org/viewvc?rev=1736281&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59217
Merged revision 1736280 from tomcat/trunk:
Remove duplication in the recycling of the path. Patch is provided by Kyohei
Nakamura.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 07:57:01 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?rev=1736281&r1=1736280&r2=1736281&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Wed
Mar 23 07:57:01 2016
@@ -57,7 +57,6 @@ public class ServerCookie implements Ser
}
public void recycle() {
- path.recycle();
name.recycle();
value.recycle();
comment.recycle();
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1736281&r1=1736280&r2=1736281&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Mar 23 07:57:01 2016
@@ -52,6 +52,11 @@
<code>o.a.tomcat.util.file.ConfigFileLoader</code> when
<code>catalina.base</code> is not specified. (violetagg)
</fix>
+ <fix>
+ <bug>59217</bug>: Remove duplication in the recycling of the path in
+ <code>o.a.tomcat.util.http.ServerCookie</code>. Patch is provided by
+ Kyohei Nakamura. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
