Author: rjung
Date: Sat Sep 24 11:16:50 2011
New Revision: 1175159
URL: http://svn.apache.org/viewvc?rev=1175159&view=rev
Log:
1) Use setters when cloning attributes.
Should be more safe in most cases.
Example: setting name directly was wrong,
because name in base class was something else
then in the sub classes.
Not using the setter for maxActiveSessions,
because it will also call property change
listeners.
2) Add Override annotation to recently added
methods.
Merge of r1175155 and r1175158 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 11:16:50 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983,1175155,1175158
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1175159&r1=1175158&r2=1175159&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Sat Sep 24 11:16:50 2011
@@ -181,10 +181,10 @@ public abstract class ClusterManagerBase
}
protected void clone(ClusterManagerBase copy) {
- copy.name = "Clone-from-" + getName();
- copy.cluster = getCluster();
+ copy.setName("Clone-from-" + getName());
+ copy.setCluster(getCluster());
copy.maxActiveSessions = getMaxActiveSessions();
- copy.notifyListenersOnReplication = isNotifyListenersOnReplication();
+ copy.setNotifyListenersOnReplication(isNotifyListenersOnReplication());
copy.setSessionAttributeFilter(getSessionAttributeFilter());
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1175159&r1=1175158&r2=1175159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Sat Sep 24 11:16:50 2011
@@ -566,6 +566,7 @@ public class DeltaSession extends Standa
* @param value The value of the attribute to check
* @return true if the attribute is distributable, false otherwise
*/
+ @Override
protected boolean isAttributeDistributable(String name, Object value) {
if (manager instanceof ClusterManagerBase &&
!((ClusterManagerBase)manager).willAttributeDistribute(name))
@@ -578,6 +579,7 @@ public class DeltaSession extends Standa
* @param name the attribute's name
* @return true is attribute should not be replicated
*/
+ @Override
protected boolean exclude(String name) {
if (super.exclude(name))
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
