Author: kfujino
Date: Wed Apr 11 05:58:08 2012
New Revision: 1324575
URL: http://svn.apache.org/viewvc?rev=1324575&view=rev
Log:
Avoid NPE when reload if a state of a BackupManager is FAILED.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1324575&r1=1324574&r2=1324575&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Wed Apr
11 05:58:08 2012
@@ -20,10 +20,12 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.catalina.Cluster;
import org.apache.catalina.DistributedManager;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Session;
+import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.tribes.Channel;
@@ -143,6 +145,15 @@ public class BackupManager extends Clust
super.startInternal();
try {
+ if (getCluster() == null) {
+ Cluster cluster = getContainer().getCluster();
+ if (cluster instanceof CatalinaCluster) {
+ setCluster((CatalinaCluster)cluster);
+ } else {
+ throw new LifecycleException(
+ "no cluster associated with this context: " +
getName());
+ }
+ }
cluster.registerManager(this);
LazyReplicatedMap<String,Session> map =
new LazyReplicatedMap<String,Session>(this,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
