Author: kfujino
Date: Thu Mar 12 02:28:42 2015
New Revision: 1666066
URL: http://svn.apache.org/r1666066
Log:
Remove unnecessary method that always returns true.
The domain filtering works on DomainFilterInterceptor.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1666066&r1=1666065&r2=1666066&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Thu Mar 12 02:28:42 2015
@@ -1178,22 +1178,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.
*
@@ -1205,9 +1189,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/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1666066&r1=1666065&r2=1666066&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar 12 02:28:42 2015
@@ -188,6 +188,14 @@
</update>
</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: [email protected]
For additional commands, e-mail: [email protected]
