Author: markt
Date: Sat Jul 4 15:59:05 2009
New Revision: 791144
URL: http://svn.apache.org/viewvc?rev=791144&view=rev
Log:
Deprecation fixes
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=791144&r1=791143&r2=791144&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Sat Jul 4 15:59:05 2009
@@ -1283,7 +1283,7 @@
String path = tokenizer.nextToken();
try {
File libFile = new File(path);
- urls.add(libFile.toURL());
+ urls.add(libFile.toURI().toURL());
} catch (IOException ioe) {
// Failing a toCanonicalPath on a file that
// exists() should be a JVM regression test,
@@ -1299,7 +1299,7 @@
if (classes.exists()) {
classPath = classPath + File.pathSeparator
+ classes.getCanonicalPath();
- urls.add(classes.getCanonicalFile().toURL());
+ urls.add(classes.getCanonicalFile().toURI().toURL());
}
} catch (IOException ioe) {
// failing a toCanonicalPath on a file that
@@ -1324,7 +1324,7 @@
File libFile = new File(lib, libs[i]);
classPath = classPath + File.pathSeparator
+ libFile.getAbsolutePath();
- urls.add(libFile.getAbsoluteFile().toURL());
+ urls.add(libFile.getAbsoluteFile().toURI().toURL());
} catch (IOException ioe) {
// failing a toCanonicalPath on a file that
// exists() should be a JVM regression test,
@@ -1336,7 +1336,8 @@
}
// What is this ??
- urls.add(new File(clctxt.getRealPath("/")).getCanonicalFile().toURL());
+ urls.add(new File(
+ clctxt.getRealPath("/")).getCanonicalFile().toURI().toURL());
URL urlsA[]=new URL[urls.size()];
urls.toArray(urlsA);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
