← Back to branch summary

~ubuntu-branches/ubuntu/maverick/tomcat6/maverick-updates

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/loader/ResourceEntry.java

  • Committer: Bazaar Package Importer
  • Author(s): Marcus Better, Marcus Better, Thierry Carrez
  • Date: 2010-05-31 15:50:57 UTC
  • mfrom: (2.2.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100531155057-2q6116ah6vsnnqit
Tags: 6.0.26-3
http://bugs.debian.org/583896
https://launchpad.net/bugs/575303
[ Marcus Better ]
* Apply upstream fix for deadlock in WebappClassLoader. (Closes: #583896)

[ Thierry Carrez ]
* debian/tomcat6.{install,postinst}: Do not store the default root webapp
  in /usr/share/tomcat6/webapps as it increases confusion on what this
  directory contains (and its relation with /var/lib/tomcat6/webapps).
  Store it inside /usr/share/tomcat6-root instead (LP: #575303).

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/loader/ResourceEntry.java
47
47
    /**
48
48
     * Loaded class.
49
49
     */
50
 
    public Class loadedClass = null;
 
50
    public volatile Class loadedClass = null;
51
51
 
52
52
 
53
53
    /**