Author: markt
Date: Mon Feb 10 12:48:06 2014
New Revision: 1566601
URL: http://svn.apache.org/r1566601
Log:
Fix regression in previous fix for BZ55996
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1562581
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1566601&r1=1566600&r2=1566601&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Mon
Feb 10 12:48:06 2014
@@ -24,7 +24,7 @@ public class SocketWrapper<E> {
protected volatile E socket;
- protected volatile long lastAccess = -1;
+ protected volatile long lastAccess = System.currentTimeMillis();
protected long timeout = -1;
protected boolean error = false;
protected long lastRegistered = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
