Author: schultz
Date: Tue Jun 5 23:59:01 2012
New Revision: 1346675
URL: http://svn.apache.org/viewvc?rev=1346675&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53230
Changed exception type thrown when session manager exceeds active session limit.
Added:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
- copied unchanged from r1346617,
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1346675&r1=1346674&r2=1346675&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Tue
Jun 5 23:59:01 2012
@@ -635,8 +635,9 @@ public abstract class ManagerBase extend
if ((maxActiveSessions >= 0) &&
(getActiveSessions() >= maxActiveSessions)) {
rejectedSessions++;
- throw new IllegalStateException(
- sm.getString("managerBase.createSession.ise"));
+ throw new TooManyActiveSessionsException(
+ sm.getString("managerBase.createSession.ise"),
+ maxActiveSessions);
}
// Recycle or create a Session instance
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1346675&r1=1346674&r2=1346675&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jun 5 23:59:01 2012
@@ -210,6 +210,12 @@
<bug>53356</bug>: Add support for servlets mapped explicitly to the
context root of a web application. (markt)
</fix>
+ <fix>
+ <bug>53230</bug>: Changed ManagerBase to throw
+ TooManyActiveSessionsException instead of IllegalStateException
+ when the maximum number of sessions has been exceeded and a new
+ session will not be created. (schultz)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
