← Back to branch summary

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

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/core/ApplicationHttpRequest.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/catalina/core/ApplicationHttpRequest.java
55
55
 *
56
56
 * @author Craig R. McClanahan
57
57
 * @author Remy Maucherat
58
 
 * @version $Revision: 739532 $ $Date: 2009-01-31 10:52:13 +0100 (Sa, 31. Jan 2009) $
 
58
 * @version $Id: ApplicationHttpRequest.java 940804 2010-05-04 11:09:39Z kkolinko $
59
59
 */
60
60
 
61
61
class ApplicationHttpRequest extends HttpServletRequestWrapper {
525
525
                try {
526
526
                    localSession =
527
527
                        context.getManager().findSession(other.getId());
 
528
                    if (localSession != null && !localSession.isValid()) {
 
529
                        localSession = null;
 
530
                    }
528
531
                } catch (IOException e) {
529
532
                    // Ignore
530
533
                }