Author: kfujino
Date: Tue Feb 16 07:07:30 2016
New Revision: 1730639
URL: http://svn.apache.org/viewvc?rev=1730639&view=rev
Log:
Clean up: Remove unnecessary code.
There is no support for context level cluster.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1730639&r1=1730638&r2=1730639&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Feb 16 07:07:30 2016
@@ -82,7 +82,6 @@ import javax.servlet.http.HttpSessionIdL
import javax.servlet.http.HttpSessionListener;
import org.apache.catalina.Authenticator;
-import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
@@ -5143,9 +5142,6 @@ public class StandardContext extends Con
logger = null;
getLogger();
- Cluster cluster = getClusterInternal();
- if ((cluster != null) && (cluster instanceof Lifecycle))
- ((Lifecycle) cluster).start();
Realm realm = getRealmInternal();
if ((realm != null) && (realm instanceof Lifecycle))
((Lifecycle) realm).start();
@@ -5508,10 +5504,6 @@ public class StandardContext extends Con
if ((realm != null) && (realm instanceof Lifecycle)) {
((Lifecycle) realm).stop();
}
- Cluster cluster = getClusterInternal();
- if ((cluster != null) && (cluster instanceof Lifecycle)) {
- ((Lifecycle) cluster).stop();
- }
Loader loader = getLoader();
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).stop();
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1730639&r1=1730638&r2=1730639&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Feb 16 07:07:30 2016
@@ -64,6 +64,10 @@
It throws a StringIndexOutOfBoundsException if the name is exactly
"org" or "javax". (rjung)
</fix>
+ <scode>
+ Remove unnecessary code. There is no support for context level cluster.
+ (kfujino)
+ </scode>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
