Author: kfujino
Date: Wed Oct 30 05:40:38 2013
New Revision: 1536968
URL: http://svn.apache.org/r1536968
Log:
Simplify the code of DeltaManager#startInternal().
Reduce unnecessary nesting for acquisition of cluster instance.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1536968&r1=1536967&r2=1536968&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Oct
30 05:40:38 2013
@@ -27,7 +27,6 @@ import java.util.Date;
import java.util.Iterator;
import org.apache.catalina.Cluster;
-import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -768,27 +767,15 @@ public class DeltaManager extends Cluste
//the channel is already running
Cluster cluster = getCluster() ;
// stop remove cluster binding
- //wow, how many nested levels of if statements can we have ;)
if(cluster == null) {
Context context = getContext() ;
if (context != null) {
- Container host = context.getParent() ;
- if(host != null && host instanceof Host) {
- cluster = host.getCluster();
- if(cluster != null && cluster instanceof
CatalinaCluster) {
- setCluster((CatalinaCluster) cluster) ;
- } else {
- Container engine = host.getParent() ;
- if(engine != null && engine instanceof Engine) {
- cluster = engine.getCluster();
- if(cluster != null && cluster instanceof
CatalinaCluster) {
- setCluster((CatalinaCluster) cluster) ;
- }
- } else {
- cluster = null ;
- }
- }
- }
+ cluster = context.getCluster();
+ if(cluster instanceof CatalinaCluster) {
+ setCluster((CatalinaCluster) cluster);
+ } else {
+ cluster = null;
+ }
}
}
if (cluster == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
