markt 2005/03/29 13:43:38
Modified: jasper2/src/share/org/apache/jasper JspC.java
Log:
Extend fix for bug 28147 to cover the other instances (identified in bug
18477)
where symbolic links can cause problems for pre-compilation in JspC.
- Based on a patch submitted by Daniel Collins.
Revision Changes Path
1.95 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- JspC.java 25 Mar 2005 00:55:33 -0000 1.94
+++ JspC.java 29 Mar 2005 21:43:37 -0000 1.95
@@ -1160,8 +1160,8 @@
try {
File libFile = new File(lib, libs[i]);
classPath = classPath + File.pathSeparator
- + libFile.getCanonicalPath();
- urls.add(libFile.getCanonicalFile().toURL());
+ + libFile.getAbsolutePath();
+ urls.add(libFile.getAbsoluteFile().toURL());
} catch (IOException ioe) {
// failing a toCanonicalPath on a file that
// exists() should be a JVM regression test,
@@ -1193,7 +1193,7 @@
}
try {
if (f.exists()) {
- f = new File(f.getCanonicalPath());
+ f = new File(f.getAbsolutePath());
while (f != null) {
File g = new File(f, "WEB-INF");
if (g.exists() && g.isDirectory()) {
@@ -1203,7 +1203,7 @@
log.info(Localizer.getMessage(
"jspc.implicit.uriRoot",
uriRoot));
- }
+ }
break;
}
if (f.exists() && f.isDirectory()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
