← Back to branch summary

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

« back to all changes in this revision

Viewing changes to java/javax/servlet/jsp/PageContext.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/javax/servlet/jsp/PageContext.java
512
512
     * @since 2.0
513
513
     */
514
514
    public ErrorData getErrorData() {
515
 
        return new ErrorData( 
516
 
            (Throwable)getRequest().getAttribute( "javax.servlet.error.exception" ),
517
 
            ((Integer)getRequest().getAttribute( 
518
 
                "javax.servlet.error.status_code" )).intValue(),
519
 
            (String)getRequest().getAttribute( "javax.servlet.error.request_uri" ),
520
 
            (String)getRequest().getAttribute( "javax.servlet.error.servlet_name" ) );
 
515
        int status = 0;
 
516
        
 
517
        Integer status_code = (Integer)getRequest().getAttribute( 
 
518
                "javax.servlet.error.status_code");
 
519
        // Avoid NPE if attribute is not set
 
520
        if (status_code != null) {
 
521
            status = status_code.intValue();
 
522
        }
 
523
 
 
524
        return new ErrorData( 
 
525
            (Throwable)getRequest().getAttribute( "javax.servlet.error.exception" ),
 
526
            status,
 
527
            (String)getRequest().getAttribute( "javax.servlet.error.request_uri" ),
 
528
            (String)getRequest().getAttribute( "javax.servlet.error.servlet_name" ) );
521
529
    }
522
530
    
523
531
}