Author: rjung
Date: Tue Sep 20 11:32:49 2011
New Revision: 1173088
URL: http://svn.apache.org/viewvc?rev=1173088&view=rev
Log:
Pull up members "cluster" and "notifyListenersOnReplication"
to common base class.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.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=1173088&r1=1173087&r2=1173088&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Tue Sep
20 11:32:49 2011
@@ -24,7 +24,6 @@ import org.apache.catalina.DistributedMa
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;
@@ -53,15 +52,6 @@ public class BackupManager extends Clust
protected String name;
/**
- * A reference to the cluster
- */
- protected CatalinaCluster cluster;
-
- /**
- * Should listeners be notified?
- */
- private boolean notifyListenersOnReplication;
- /**
*
*/
private int mapSendOptions =
Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK;
@@ -93,13 +83,6 @@ public class BackupManager extends Clust
mExpireSessionsOnShutdown = expireSessionsOnShutdown;
}
- @Override
- public void setCluster(CatalinaCluster cluster) {
- if(log.isDebugEnabled())
- log.debug("Cluster associated with BackupManager");
- this.cluster = cluster;
- }
-
public boolean getExpireSessionsOnShutdown()
{
return mExpireSessionsOnShutdown;
@@ -160,9 +143,8 @@ public class BackupManager extends Clust
try {
cluster.registerManager(this);
- CatalinaCluster catclust = cluster;
LazyReplicatedMap map = new LazyReplicatedMap(this,
-
catclust.getChannel(),
+ cluster.getChannel(),
rpcTimeout,
getMapName(),
getClassLoaders());
@@ -176,8 +158,7 @@ public class BackupManager extends Clust
}
public String getMapName() {
- CatalinaCluster catclust = cluster;
- String name = catclust.getManagerName(getName(),this)+"-"+"map";
+ String name = cluster.getManagerName(getName(),this)+"-"+"map";
if ( log.isDebugEnabled() ) log.debug("Backup manager, Setting map
name to:"+name);
return name;
}
@@ -219,26 +200,11 @@ public class BackupManager extends Clust
public void setName(String name) {
this.name = name;
}
- @Override
- public boolean isNotifyListenersOnReplication() {
- return notifyListenersOnReplication;
- }
- public void setNotifyListenersOnReplication(boolean
notifyListenersOnReplication) {
- this.notifyListenersOnReplication = notifyListenersOnReplication;
- }
public void setMapSendOptions(int mapSendOptions) {
this.mapSendOptions = mapSendOptions;
}
- /*
- * @see org.apache.catalina.ha.ClusterManager#getCluster()
- */
- @Override
- public CatalinaCluster getCluster() {
- return cluster;
- }
-
public int getMapSendOptions() {
return mapSendOptions;
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1173088&r1=1173087&r2=1173088&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Tue Sep 20 11:32:49 2011
@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
import org.apache.catalina.Container;
import org.apache.catalina.Loader;
+import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.tribes.io.ReplicationStream;
@@ -37,6 +38,16 @@ public abstract class ClusterManagerBase
implements ClusterManager {
/**
+ * A reference to the cluster
+ */
+ protected CatalinaCluster cluster = null;
+
+ /**
+ * Should listeners be notified?
+ */
+ protected boolean notifyListenersOnReplication = true;
+
+ /**
* The pattern used for including session attributes to
* replication, e.g. <code>^(userName|sessionHistory)$</code>.
* If not set, all session attributes will be eligible for replication.
@@ -50,6 +61,27 @@ public abstract class ClusterManagerBase
*/
private Pattern sessionAttributePattern = null;
+ /*
+ * @see org.apache.catalina.ha.ClusterManager#getCluster()
+ */
+ @Override
+ public CatalinaCluster getCluster() {
+ return cluster;
+ }
+
+ @Override
+ public void setCluster(CatalinaCluster cluster) {
+ this.cluster = cluster;
+ }
+
+ @Override
+ public boolean isNotifyListenersOnReplication() {
+ return notifyListenersOnReplication;
+ }
+
+ public void setNotifyListenersOnReplication(boolean
notifyListenersOnReplication) {
+ this.notifyListenersOnReplication = notifyListenersOnReplication;
+ }
/**
* Return the string pattern used for including session attributes
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=1173088&r1=1173087&r2=1173088&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Sep
20 11:32:49 2011
@@ -87,7 +87,6 @@ public class DeltaManager extends Cluste
*/
protected static String managerName = "DeltaManager";
protected String name = null;
- private CatalinaCluster cluster = null;
/**
* cached replication valve cluster container!
@@ -95,7 +94,6 @@ public class DeltaManager extends Cluste
private volatile ReplicationValve replicationValve = null ;
private boolean expireSessionsOnShutdown = false;
- private boolean notifyListenersOnReplication = true;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
private volatile boolean stateTransfered = false ;
@@ -412,15 +410,6 @@ public class DeltaManager extends Cluste
this.expireSessionsOnShutdown = expireSessionsOnShutdown;
}
- @Override
- public boolean isNotifyListenersOnReplication() {
- return notifyListenersOnReplication;
- }
-
- public void setNotifyListenersOnReplication(boolean
notifyListenersOnReplication) {
- this.notifyListenersOnReplication = notifyListenersOnReplication;
- }
-
public boolean isNotifyContainerListenersOnReplication() {
return notifyContainerListenersOnReplication;
}
@@ -430,16 +419,6 @@ public class DeltaManager extends Cluste
this.notifyContainerListenersOnReplication =
notifyContainerListenersOnReplication;
}
- @Override
- public CatalinaCluster getCluster() {
- return cluster;
- }
-
- @Override
- public void setCluster(CatalinaCluster cluster) {
- this.cluster = cluster;
- }
-
// --------------------------------------------------------- Public Methods
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
