← Back to branch summary

~ubuntu-branches/ubuntu/precise/tomcat7/precise-updates

« back to all changes in this revision

Viewing changes to java/org/apache/jasper/servlet/JspServlet.java

  • Committer: Bazaar Package Importer
  • Author(s): tony mancill, Miguel Landaeta, tony mancill
  • Date: 2011-06-23 20:26:29 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110623202629-w1v0jejj19swux10
Tags: 7.0.16-1
[ Miguel Landaeta ]
* New upstream release.
* Add missing deps and symlinks for commons-pool ands commons-dbcp jars.

[ tony mancill ]
* Add logrotate file for catalina.out.
* Add build-arch target to debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/jasper/servlet/JspServlet.java
129
129
                   AccessController.doPrivileged(new PrivilegedExceptionAction<Object>(){
130
130
                        @Override
131
131
                        public Object run() throws IOException, ServletException {
132
 
                            serviceJspFile(null, null, jspFile, null, true);
 
132
                            serviceJspFile(null, null, jspFile, true);
133
133
                            return null;
134
134
                        }
135
135
                    });
136
136
                } else {
137
 
                    serviceJspFile(null, null, jspFile, null, true);
 
137
                    serviceJspFile(null, null, jspFile, true);
138
138
                }
139
139
            } catch (IOException e) {
140
140
                throw new ServletException("Could not precompile jsp: " + jspFile, e);
330
330
 
331
331
        try {
332
332
            boolean precompile = preCompile(request);
333
 
            serviceJspFile(request, response, jspUri, null, precompile);
 
333
            serviceJspFile(request, response, jspUri, precompile);
334
334
        } catch (RuntimeException e) {
335
335
            throw e;
336
336
        } catch (ServletException e) {
364
364
 
365
365
    private void serviceJspFile(HttpServletRequest request,
366
366
                                HttpServletResponse response, String jspUri,
367
 
                                Throwable exception, boolean precompile)
 
367
                                boolean precompile)
368
368
        throws ServletException, IOException {
369
369
 
370
370
        JspServletWrapper wrapper = rctxt.getWrapper(jspUri);
378
378
                        handleMissingResource(request, response, jspUri);
379
379
                        return;
380
380
                    }
381
 
                    boolean isErrorPage = exception != null;
382
381
                    wrapper = new JspServletWrapper(config, options, jspUri,
383
 
                                                    isErrorPage, rctxt);
 
382
                                                    rctxt);
384
383
                    rctxt.addWrapper(jspUri,wrapper);
385
384
                }
386
385
            }