Author: kfujino
Date: Wed Apr 11 06:10:25 2012
New Revision: 1324578
URL: http://svn.apache.org/viewvc?rev=1324578&view=rev
Log:
Avoid NPE when reload if a state of a BackupManager is FAILED.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1324578&r1=1324577&r2=1324578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
Wed Apr 11 06:10:25 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;
@@ -142,6 +144,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 map = new LazyReplicatedMap(this,
cluster.getChannel(),
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1324578&r1=1324577&r2=1324578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Apr 11 06:10:25 2012
@@ -77,6 +77,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ Avoid NPE when reload if a state of a BackupManager is FAILED.
(kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
