Author: markt
Date: Wed Apr 7 21:46:55 2010
New Revision: 931699
URL: http://svn.apache.org/viewvc?rev=931699&view=rev
Log:
Further corrections to SSL session timeout attribute name.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=931699&r1=931698&r2=931699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Wed Apr
7 21:46:55 2010
@@ -559,9 +559,9 @@ public abstract class AbstractEndpoint {
public String getSessionCacheSize() { return sessionCacheSize;}
public void setSessionCacheSize(String s) { sessionCacheSize = s;}
- private String sessionCacheTimeout = "86400";
- public String getSessionCacheTimeout() { return sessionCacheTimeout;}
- public void setSessionCacheTimeout(String s) { sessionCacheTimeout = s;}
+ private String sessionTimeout = "86400";
+ public String getSessionTimeout() { return sessionTimeout;}
+ public void setSessionTimeout(String s) { sessionTimeout = s;}
private String allowUnsafeLegacyRenegotiation = null;
public String getAllowUnsafeLegacyRenegotiation() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=931699&r1=931698&r2=931699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Wed Apr 7
21:46:55 2010
@@ -342,7 +342,7 @@ public class JIoEndpoint extends Abstrac
serverSocketFactory.setAttribute(SSL_ATTR_SESSION_CACHE_SIZE,
getSessionCacheSize());
serverSocketFactory.setAttribute(SSL_ATTR_SESSION_TIMEOUT,
- getSessionCacheTimeout());
+ getSessionTimeout());
serverSocketFactory.setAttribute(SSL_ATTR_ALLOW_UNSAFE_RENEG,
getAllowUnsafeLegacyRenegotiation());
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=931699&r1=931698&r2=931699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Apr 7
21:46:55 2010
@@ -539,9 +539,9 @@ public class NioEndpoint extends Abstrac
sessionContext.setSessionCacheSize(
Integer.parseInt(getSessionCacheSize()));
}
- if (getSessionCacheTimeout() != null) {
+ if (getSessionTimeout() != null) {
sessionContext.setSessionTimeout(
- Integer.parseInt(getSessionCacheTimeout()));
+ Integer.parseInt(getSessionTimeout()));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
