Author: markt
Date: Fri Mar 9 17:26:21 2018
New Revision: 1826361
URL: http://svn.apache.org/viewvc?rev=1826361&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62168
When using the PersistentManager honor a value of -1 for minIdleSwap and do not
swap out sessions to keep the number of active sessions under maxActive<.
Patch provided by Holger Sunke.
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1826361&r1=1826360&r2=1826361&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Fri Mar 9 17:26:21 2018
@@ -937,8 +937,9 @@ public abstract class PersistentManagerB
*/
protected void processMaxActiveSwaps() {
- if (!getState().isAvailable() || getMaxActiveSessions() < 0)
+ if (!getState().isAvailable() || minIdleSwap < 0 ||
getMaxActiveSessions() < 0) {
return;
+ }
Session sessions[] = findSessions();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1826361&r1=1826360&r2=1826361&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 9 17:26:21 2018
@@ -52,6 +52,12 @@
<code>SSLHostConfigCertificate</code> are correctly formed when the
<code>Connector</code> is bound to a specific IP address. (markt)
</fix>
+ <fix>
+ <bug>62168</bug>: When using the <code>PersistentManager</code> honor a
+ value of <code>-1</code> for <code>minIdleSwap</code> and do not swap
+ out sessions to keep the number of active sessions under
+ <code>maxActive</code>. Patch provided by Holger Sunke. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
