Author: kfujino
Date: Thu Mar 12 02:16:15 2015
New Revision: 1666063

URL: http://svn.apache.org/r1666063
Log:
Remove unnecessary method that always returns true.
The domain filtering works on DomainFilterInterceptor.

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

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=1666063&r1=1666062&r2=1666063&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Mar 
12 02:16:15 2015
@@ -1179,22 +1179,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.
      *
@@ -1206,9 +1190,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 {
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to