Author: markt
Date: Wed Jan 27 19:22:47 2016
New Revision: 1727158
URL: http://svn.apache.org/viewvc?rev=1727158&view=rev
Log:
Follow-up to r1726922.
Add missed check that the Manager is NEW when the context is set.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
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=1727158&r1=1727157&r2=1727158&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 Wed
Jan 27 19:22:47 2016
@@ -42,6 +42,7 @@ import org.apache.catalina.Engine;
import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.SessionIdGenerator;
@@ -375,7 +376,9 @@ public abstract class ManagerBase extend
// NO-OP
return;
}
-
+ if (!getState().equals(LifecycleState.NEW)) {
+ throw new
IllegalStateException(sm.getString("managerBase.setContextNotNew"));
+ }
Container oldContainer = this.container;
this.container = container;
// TODO - delete the line below in Tomcat 9 onwards
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
