← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat6/oneiric

« back to all changes in this revision

Viewing changes to java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-07-20 14:36:48 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100720143648-23y81x6cq1kv1z00
Tags: 6.0.28-2
* Add debconf questions for user, group and Java options.
* Use ucf to install /etc/default/tomcat6 from a template
* Drop CATALINA_BASE and CATALINA_HOME from /etc/default/tomcat6 since we
  shouldn't encourage users to change those anyway

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
431
431
            } else {
432
432
                sessionCacheSize = defaultSessionCacheSize;
433
433
            }
434
 
            int sessionCacheTimeout;
435
 
            if (attributes.get("sessionCacheTimeout") != null) {
436
 
                sessionCacheTimeout = Integer.parseInt(
437
 
                        (String)attributes.get("sessionCacheTimeout"));
 
434
            int sessionTimeout;
 
435
            if (attributes.get("sessionTimeout") != null) {
 
436
                sessionTimeout = Integer.parseInt(
 
437
                        (String)attributes.get("sessionTimeout"));
438
438
            } else {
439
 
                sessionCacheTimeout = defaultSessionTimeout;
 
439
                sessionTimeout = defaultSessionTimeout;
440
440
            }
441
441
            SSLSessionContext sessionContext =
442
442
                context.getServerSessionContext();
443
443
            if (sessionContext != null) {
444
444
                sessionContext.setSessionCacheSize(sessionCacheSize);
445
 
                sessionContext.setSessionTimeout(sessionCacheTimeout);
 
445
                sessionContext.setSessionTimeout(sessionTimeout);
446
446
            }
447
447
 
448
448
            // create proxy