r9736 - helma-ng/trunk/src/org/helma/repository

[email protected] Wed, 13 May 2009 11:50:39 +0200 (CEST)
Newsgroups gmane.comp.java.helma.cvs
Message-ID <20090513095039.56F213D0D6@mia>
Author: hannes
Date: 2009-05-13 11:50:39 +0200 (Wed, 13 May 2009)
New Revision: 9736

Modified:
   helma-ng/trunk/src/org/helma/repository/FileRepository.java
   helma-ng/trunk/src/org/helma/repository/FileResource.java
Log:
Do not resolve to canonical paths in FileRepository and FileResource constructors, it breaks symbolic links.

Details at http://dev.helma.org/trac/helma/changeset/9736

Modified: helma-ng/trunk/src/org/helma/repository/FileRepository.java
===================================================================
--- helma-ng/trunk/src/org/helma/repository/FileRepository.java	2009-05-13 09:50:27 UTC (rev 9735)
+++ helma-ng/trunk/src/org/helma/repository/FileRepository.java	2009-05-13 09:50:39 UTC (rev 9736)
@@ -66,11 +66,7 @@
     protected FileRepository(File dir, FileRepository parent) {
         // make sure our directory has an absolute path,
         // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4117557
-        try {
-            directory = dir.getCanonicalFile();
-        } catch (IOException iox) {
-            directory = dir.getAbsoluteFile();
-        }
+        directory = dir.getAbsoluteFile();
 
         if (parent == null) {
             path = name = directory.getAbsolutePath();

Modified: helma-ng/trunk/src/org/helma/repository/FileResource.java
===================================================================
--- helma-ng/trunk/src/org/helma/repository/FileResource.java	2009-05-13 09:50:27 UTC (rev 9735)
+++ helma-ng/trunk/src/org/helma/repository/FileResource.java	2009-05-13 09:50:39 UTC (rev 9736)
@@ -32,11 +32,7 @@
     protected FileResource(File file, FileRepository repository) {
         // make sure our directory has an absolute path,
         // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4117557
-        try {
-            file = file.getCanonicalFile();
-        } catch (IOException iox) {
-            file = file.getAbsoluteFile();
-        }
+        file = file.getAbsoluteFile();
 
         this.file = file;
         this.repository = repository == null ?