← Back to branch summary

~ubuntu-branches/ubuntu/precise/tomcat7/precise-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java

  • Committer: Bazaar Package Importer
  • Author(s): tony mancill
  • Date: 2011-07-25 22:58:33 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110725225833-1t773ak3y3g9utm2
Tags: 7.0.19-1
http://bugs.debian.org/634992
* Team upload.
* New upstream release.
  - Includes fix for CVE-2011-2526 (Closes: #634992)
* Remove patch for CVE-2011-2204 (included upstream).

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
45
45
 * management.
46
46
 *
47
47
 * @author Craig R. McClanahan
48
 
 * @version $Id: GlobalResourcesLifecycleListener.java 987920 2010-08-22 15:34:34Z markt $
 
48
 * @version $Id: GlobalResourcesLifecycleListener.java 1142655 2011-07-04 13:28:11Z markt $
49
49
 * @since 4.1
50
50
 */
51
51
 
76
76
     *
77
77
     * @param event The event that has occurred
78
78
     */
 
79
    @Override
79
80
    public void lifecycleEvent(LifecycleEvent event) {
80
81
 
81
82
        if (Lifecycle.START_EVENT.equals(event.getType())) {