svn commit: r1524652 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsSession.java WsWebSocketContainer.java

[markt]

Author: markt
Date: Thu Sep 19 08:21:28 2013
New Revision: 1524652

URL: http://svn.apache.org/r1524652
Log:
Rename method for clarity

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
    tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1524652&r1=1524651&r2=1524652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Thu Sep 19 
08:21:28 2013
@@ -588,7 +588,7 @@ public class WsSession implements Sessio
     }
 
 
-    protected void expire() {
+    protected void checkExpiration() {
         long timeout = maxIdleTimeout;
         if (timeout < 1) {
             return;

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1524652&r1=1524651&r2=1524652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu 
Sep 19 08:21:28 2013
@@ -751,7 +751,7 @@ public class WsWebSocketContainer
             backgroundProcessCount = 0;
 
             for (WsSession wsSession : sessions.keySet()) {
-                wsSession.expire();
+                wsSession.checkExpiration();
             }
         }
 



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