← Back to branch summary

~ubuntu-branches/ubuntu/maverick/tomcat6/maverick-security

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/core/AprLifecycleListener.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-05-21 13:51:15 UTC
  • mfrom: (2.2.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100521135115-qfwnf24lzvi3644v
Tags: 6.0.26-2
http://bugs.debian.org/581018
https://launchpad.net/bugs/557300
https://launchpad.net/bugs/569118
* debian/tomcat6.{postinst,prerm}: Respect TOMCAT6_USER and TOMCAT6_GROUP
  as defined in /etc/default/tomcat6 when setting directory permissions and
  authbind configuration (Closes: #581018, LP: #557300)
* debian/tomcat6.postinst: Use group "tomcat6" instead of "adm" for
  permissions in /var/lib/tomcat6, so that group "adm" doesn't get write
  permissions over /var/lib/tomcat6/webapps (LP: #569118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/core/AprLifecycleListener.java
37
37
 * 
38
38
 * @author Remy Maucherat
39
39
 * @author Filip Hanik
40
 
 * @version $Revision: 898409 $ $Date: 2010-01-12 17:39:17 +0100 (Di, 12. Jan 2010) $
 
40
 * @version $Revision: 911300 $ $Date: 2010-02-18 10:53:12 +0100 (Do, 18. Feb 2010) $
41
41
 * @since 4.1
42
42
 */
43
43
 
46
46
 
47
47
    private static Log log = LogFactory.getLog(AprLifecycleListener.class);
48
48
 
 
49
    private static boolean instanceCreated = false;
49
50
    /**
50
51
     * The string manager for this package.
51
52
     */
71
72
    protected static boolean aprAvailable = false;
72
73
 
73
74
    public static boolean isAprAvailable() {
74
 
        init();
 
75
        //https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
 
76
        if (instanceCreated) init();
75
77
        return aprAvailable;
76
78
    }
 
79
    
 
80
    public AprLifecycleListener() {
 
81
        instanceCreated = true;
 
82
    }
77
83
 
78
84
    // ---------------------------------------------- LifecycleListener Methods
79
85