Clean-up.

markt-asf · markt-asf · commit 692806344e7a · 2013-07-09T14:48:40.000Z
Extracted from a patch by Jeremy Boynes. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1501304 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jasper;
 
 import java.io.BufferedReader;
@@ -30,7 +29,6 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.Writer;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -1414,15 +1412,11 @@ protected void completeWebXml() {
         }
     }
 
-    protected void initServletContext() {
-        try {
-            context =new JspCServletContext
-                (new PrintWriter(System.out),
-                 new URL("file:" + uriRoot.replace('\\','/') + '/'));
-            tldLocationsCache = TldLocationsCache.getInstance(context);
-        } catch (MalformedURLException me) {
-            System.out.println("**" + me);
-        }
+    protected void initServletContext() throws IOException {
+     // TODO: should we use the Ant Project's log?
+        PrintWriter log = new PrintWriter(System.out);
+        URL resourceBase = new File(uriRoot).getCanonicalFile().toURI().toURL();
+        context = new JspCServletContext(log, resourceBase);
         rctxt = new JspRuntimeContext(context, this);
         jspConfig = new JspConfig(context);
         tagPluginManager = new TagPluginManager(context);
