Author: schultz
Date: Tue Jun 5 21:46:21 2012
New Revision: 1346617
URL: http://svn.apache.org/viewvc?rev=1346617&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/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1346617&r1=1346616&r2=1346617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Jun 5
21:46:21 2012
@@ -613,8 +613,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
Added:
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java?rev=1346617&view=auto
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
Tue Jun 5 21:46:21 2012
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.session;
+
+/**
+ * An exception that indicates the maximum number of active sessions has been
+ * reached and the server is refusing to create any new sessions.
+ */
+public class TooManyActiveSessionsException
+ extends IllegalStateException
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * The maximum number of active sessions the server will tolerate.
+ */
+ private final int maxActiveSessions;
+
+ /**
+ * Creates a new TooManyActiveSessionsException.
+ *
+ * @param message A description for the exception.
+ * @param maxActive The maximum number of active sessions allowed by the
+ * session manager.
+ */
+ public TooManyActiveSessionsException(String message,
+ int maxActive)
+ {
+ super(message);
+
+ maxActiveSessions = maxActive;
+ }
+
+ /**
+ * Gets the maximum number of sessions allowed by the session manager.
+ *
+ * @return The maximum number of sessions allowed by the session manager.
+ */
+ public int getMaxActiveSessions()
+ {
+ return maxActiveSessions;
+ }
+}
Propchange:
tomcat/trunk/java/org/apache/catalina/session/TooManyActiveSessionsException.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
