svn commit: r1560652 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

[ma...@apache.org]

Author: markt
Date: Thu Jan 23 12:14:24 2014
New Revision: 1560652

URL: http://svn.apache.org/r1560652
Log:
Code clean-up
 - BackupManager is an instance of ClusterManagerBase
 - StandardManager is an instance of ManagerBase

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1560652&r1=1560651&r2=1560652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Jan 23 12:14:24 2014
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.ha.session;
 
 import java.io.Externalizable;
@@ -41,7 +40,6 @@ import org.apache.catalina.ha.ClusterMes
 import org.apache.catalina.ha.ClusterSession;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.session.ManagerBase;
-import org.apache.catalina.session.StandardManager;
 import org.apache.catalina.session.StandardSession;
 import org.apache.catalina.tribes.io.ReplicationStream;
 import org.apache.catalina.tribes.tipis.ReplicatedMapEntry;
@@ -147,15 +145,12 @@ public class DeltaSession extends Standa
     }
 
     public ClassLoader[] getClassLoaders() {
-        if ( manager instanceof BackupManager ) return ((BackupManager)manager).getClassLoaders();
-        else if ( manager instanceof ClusterManagerBase ) return ((ClusterManagerBase)manager).getClassLoaders();
-        else if ( manager instanceof StandardManager ) {
-            StandardManager sm = (StandardManager)manager;
-            return ClusterManagerBase.getClassLoaders(sm.getContext());
-        } else if ( manager instanceof ManagerBase ) {
+        if (manager instanceof ClusterManagerBase) {
+            return ((ClusterManagerBase)manager).getClassLoaders();
+        } else if (manager instanceof ManagerBase) {
             ManagerBase mb = (ManagerBase)manager;
             return ClusterManagerBase.getClassLoaders(mb.getContext());
-        }//end if
+        }
         return null;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org