You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/19 13:02:52 UTC
svn commit: r1524688 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/tomcat/websocket/WsSession.java
java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: markt
Date: Thu Sep 19 11:02:52 2013
New Revision: 1524688
URL: http://svn.apache.org/r1524688
Log:
Rename method for clarity
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1524652
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1524688&r1=1524687&r2=1524688&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Thu Sep 19 11:02:52 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/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1524688&r1=1524687&r2=1524688&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu Sep 19 11:02:52 2013
@@ -780,7 +780,7 @@ public class WsWebSocketContainer
backgroundProcessCount = 0;
for (WsSession wsSession : sessions.keySet()) {
- wsSession.expire();
+ wsSession.checkExpiration();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org