You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2015/03/12 03:49:00 UTC
svn commit: r1666071 - in /tomcat/tc7.0.x/trunk:
java/org/apache/catalina/ha/session/DeltaManager.java
webapps/docs/changelog.xml
Author: kfujino
Date: Thu Mar 12 02:48:59 2015
New Revision: 1666071
URL: http://svn.apache.org/r1666071
Log:
Remove unnecessary method that always returns true.
The domain filtering works on DomainFilterInterceptor.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1666071&r1=1666070&r2=1666071&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Mar 12 02:48:59 2015
@@ -1160,22 +1160,6 @@ public class DeltaManager extends Cluste
// -------------------------------------------------------- message receive
/**
- * Test that sender and local domain is the same
- */
- protected boolean checkSenderDomain(SessionMessage msg,Member sender) {
- boolean sameDomain= true;
- if (!sameDomain && log.isWarnEnabled()) {
- log.warn(sm.getString("deltaManager.receiveMessage.fromWrongDomain",
- new Object[] {getName(),
- msg.getEventTypeString(),
- sender,
- "",
- "" }));
- }
- return sameDomain ;
- }
-
- /**
* This method is called by the received thread when a SessionMessage has
* been received from one of the other nodes in the cluster.
*
@@ -1187,9 +1171,6 @@ public class DeltaManager extends Cluste
* requesting node
*/
protected void messageReceived(SessionMessage msg, Member sender) {
- if(!checkSenderDomain(msg,sender)) {
- return;
- }
ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
try {
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=1666071&r1=1666070&r2=1666071&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 12 02:48:59 2015
@@ -246,6 +246,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ Remove unnecessary method that always returns true. The domain filtering
+ works on <code>DomainFilterInterceptor</code>. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org