Further corrections to SSL session timeout attribute name.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@931699 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 6121e07..c650f60 100644 (file)
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -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() {

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 3b7a4f6..a4b6c02 100644 (file)
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -342,7 +342,7 @@ public class JIoEndpoint extends AbstractEndpoint {
             serverSocketFactory.setAttribute(SSL_ATTR_SESSION_CACHE_SIZE,
                     getSessionCacheSize());
             serverSocketFactory.setAttribute(SSL_ATTR_SESSION_TIMEOUT,
-                    getSessionCacheTimeout());
+                    getSessionTimeout());
             serverSocketFactory.setAttribute(SSL_ATTR_ALLOW_UNSAFE_RENEG,
                     getAllowUnsafeLegacyRenegotiation());
         }

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 808808f..69a7e17 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -539,9 +539,9 @@ public class NioEndpoint extends AbstractEndpoint {
                     sessionContext.setSessionCacheSize(
                             Integer.parseInt(getSessionCacheSize()));
                 }
-                if (getSessionCacheTimeout() != null) {
+                if (getSessionTimeout() != null) {
                     sessionContext.setSessionTimeout(
-                            Integer.parseInt(getSessionCacheTimeout()));
+                            Integer.parseInt(getSessionTimeout()));
                 }
             }
         }