Remove some declared exceptions that are never thrown

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@895429 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/JspCompilationContext.java b/java/org/apache/jasper/JspCompilationContext.java
index ebbb5f6..967c6c0 100644 (file)
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -205,7 +205,7 @@ public class JspCompilationContext {
      * is not done yet. Right now we're just hardcoding the actual
      * compilers that are created. 
      */
-    public Compiler createCompiler() throws JasperException {
+    public Compiler createCompiler() {
         if (jspCompiler != null ) {
             return jspCompiler;
         }
@@ -606,9 +606,7 @@ public class JspCompilationContext {
 
     // ==================== Manipulating the class ====================
 
-    public Class<?> load() 
-        throws JasperException, FileNotFoundException
-    {
+    public Class<?> load() throws JasperException {
         try {
             getJspLoader();
             

diff --git a/java/org/apache/jasper/compiler/JspReader.java b/java/org/apache/jasper/compiler/JspReader.java
index 6113d85..31cef37 100644 (file)
--- a/java/org/apache/jasper/compiler/JspReader.java
+++ b/java/org/apache/jasper/compiler/JspReader.java
@@ -128,7 +128,7 @@ class JspReader {
                      String encoding,
                      InputStreamReader reader,
                      ErrorDispatcher err)
-            throws JasperException, FileNotFoundException {
+            throws JasperException {
 
         this.context = ctxt;
         this.err = err;
@@ -532,8 +532,7 @@ class JspReader {
      * current position in the current file is remembered.
      */
     private void pushFile(String file, String encoding, 
-                           InputStreamReader reader) 
-                throws JasperException, FileNotFoundException {
+                           InputStreamReader reader) throws JasperException {
 
         // Register the file
         String longName = file;

diff --git a/java/org/apache/jasper/compiler/ServletWriter.java b/java/org/apache/jasper/compiler/ServletWriter.java
index 5dedc2b..5bfc982 100644 (file)
--- a/java/org/apache/jasper/compiler/ServletWriter.java
+++ b/java/org/apache/jasper/compiler/ServletWriter.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jasper.compiler;
 
-import java.io.IOException;
 import java.io.PrintWriter;
 
 /**
@@ -44,7 +43,7 @@ public class ServletWriter {
        this.writer = writer;
     }
 
-    public void close() throws IOException {
+    public void close() {
        writer.close();
     }
 

diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java b/java/org/apache/jasper/runtime/PageContextImpl.java
index 19769af..cdae511 100644 (file)
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -128,8 +128,7 @@ public class PageContextImpl extends PageContext {
 
        private void _initialize(Servlet servlet, ServletRequest request,
                        ServletResponse response, String errorPageURL,
-                       boolean needsSession, int bufferSize, boolean autoFlush)
-                       throws IOException {
+                       boolean needsSession, int bufferSize, boolean autoFlush) {
 
                // initialize state
                this.servlet = servlet;

diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index b0267ec..be7d227 100644 (file)
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -86,8 +86,7 @@ public class JspServletWrapper {
      * JspServletWrapper for JSP pages.
      */
     public JspServletWrapper(ServletConfig config, Options options, String jspUri,
-                      boolean isErrorPage, JspRuntimeContext rctxt)
-            throws JasperException {
+                      boolean isErrorPage, JspRuntimeContext rctxt) {
 
         this.isTagFile = false;
         this.config = config;
@@ -106,8 +105,7 @@ public class JspServletWrapper {
                              String tagFilePath,
                              TagInfo tagInfo,
                              JspRuntimeContext rctxt,
-                             URL tagFileJarUrl)
-            throws JasperException {
+                             URL tagFileJarUrl) {
 
         this.isTagFile = true;
         this.config = null;        // not used
@@ -127,9 +125,7 @@ public class JspServletWrapper {
         this.reload = reload;
     }
 
-    public Servlet getServlet()
-        throws ServletException, IOException, FileNotFoundException
-    {
+    public Servlet getServlet() throws ServletException {
         if (reload) {
             synchronized (this) {
                 // Synchronizing on jsw enables simultaneous loading