tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kfuj...@apache.org
Subject svn commit: r1832069 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Date Wed, 23 May 2018 02:31:00 GMT
Author: kfujino
Date: Wed May 23 02:31:00 2018
New Revision: 1832069

URL: http://svn.apache.org/viewvc?rev=1832069&view=rev
Log:
Simplify the code.
remove unnecessary code.

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=1832069&r1=1832068&r2=1832069&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed May 23 02:31:00
2018
@@ -757,16 +757,12 @@ public class DeltaManager extends Cluste
                 synchronized(receivedMessageQueue) {
                     for (SessionMessage smsg : receivedMessageQueue) {
                         if (!stateTimestampDrop) {
-                            messageReceived(smsg,
-                                    smsg.getAddress() != null ? smsg.getAddress() : null);
+                            messageReceived(smsg, smsg.getAddress());
                         } else {
                             if (smsg.getEventType() != SessionMessage.EVT_GET_ALL_SESSIONS
&&
                                     smsg.getTimestamp() >= stateTransferCreateSendTime)
{
                                 // FIXME handle EVT_GET_ALL_SESSIONS later
-                                messageReceived(smsg,
-                                        smsg.getAddress() != null ?
-                                                smsg.getAddress() :
-                                                null);
+                                messageReceived(smsg, smsg.getAddress());
                             } else {
                                 if (log.isWarnEnabled()) {
                                     log.warn(sm.getString("deltaManager.dropMessage",
@@ -917,7 +913,7 @@ public class DeltaManager extends Cluste
                     break;
             } //switch
 
-            messageReceived(msg, msg.getAddress() != null ? msg.getAddress() : null);
+            messageReceived(msg, msg.getAddress());
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message