Author: rjung
Date: Tue Sep 20 11:36:29 2011
New Revision: 1173090
URL: http://svn.apache.org/viewvc?rev=1173090&view=rev
Log:
- Pull up common clode code to base class.
- Add sessionAttributeFilter to clone method
- Reduce visibility of notifyListenersOnReplication
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=1173090&r1=1173089&r2=1173090&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:36:29 2011
@@ -225,10 +225,8 @@ public class BackupManager extends Clust
@Override
public ClusterManager cloneFromTemplate() {
BackupManager result = new BackupManager();
+ clone(result);
result.mExpireSessionsOnShutdown = mExpireSessionsOnShutdown;
- result.name = "Clone-from-"+name;
- result.cluster = cluster;
- result.notifyListenersOnReplication = notifyListenersOnReplication;
result.mapSendOptions = mapSendOptions;
result.maxActiveSessions = maxActiveSessions;
result.rpcTimeout = rpcTimeout;
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=1173090&r1=1173089&r2=1173090&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:36:29 2011
@@ -45,7 +45,7 @@ public abstract class ClusterManagerBase
/**
* Should listeners be notified?
*/
- protected boolean notifyListenersOnReplication = true;
+ private boolean notifyListenersOnReplication = true;
/**
* The pattern used for including session attributes to
@@ -179,4 +179,13 @@ public abstract class ClusterManagerBase
public void unload() {
// NOOP
}
+
+ protected void clone(ClusterManagerBase copy) {
+ copy.name = "Clone-from-" + getName();
+ copy.cluster = getCluster();
+ copy.maxActiveSessions = getMaxActiveSessions();
+ copy.notifyListenersOnReplication = isNotifyListenersOnReplication();
+ copy.sessionAttributeFilter = getSessionAttributeFilter();
+ }
+
}
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=1173090&r1=1173089&r2=1173090&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:36:29 2011
@@ -1319,7 +1319,7 @@ public class DeltaManager extends Cluste
try {
session.lock();
DeltaRequest dreq = deserializeDeltaRequest(session, delta);
- dreq.execute(session, notifyListenersOnReplication);
+ dreq.execute(session, isNotifyListenersOnReplication());
session.setPrimarySession(false);
}finally {
session.unlock();
@@ -1479,12 +1479,9 @@ public class DeltaManager extends Cluste
@Override
public ClusterManager cloneFromTemplate() {
DeltaManager result = new DeltaManager();
- result.name = "Clone-from-"+name;
- result.cluster = cluster;
+ clone(result);
result.replicationValve = replicationValve;
- result.maxActiveSessions = maxActiveSessions;
result.expireSessionsOnShutdown = expireSessionsOnShutdown;
- result.notifyListenersOnReplication = notifyListenersOnReplication;
result.notifySessionListenersOnReplication =
notifySessionListenersOnReplication;
result.notifyContainerListenersOnReplication =
notifyContainerListenersOnReplication;
result.stateTransferTimeout = stateTransferTimeout;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
