svn commit: r1051974 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java

[ri...@apache.org]

Author: rickhall
Date: Wed Dec 22 16:35:02 2010
New Revision: 1051974

URL: http://svn.apache.org/viewvc?rev=1051974&view=rev
Log:
Modify DirectoryContent to verify that an entry is a directory if
the entry name ends with "/". (FELIX-2710)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java?rev=1051974&r1=1051973&r2=1051974&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java Wed Dec 22 16:35:02 2010
@@ -63,7 +63,13 @@ public class DirectoryContent implements
             name = name.substring(1);
         }
 
-        return new File(m_dir, name).exists();
+        // Return true if the file associated with the entry exists,
+        // unless the entry name ends with "/", in which case only
+        // return true if the file is really a directory.
+        File file = new File(m_dir, name);
+        return BundleCache.getSecureAction().fileExists(file)
+            && (name.endsWith("/")
+                ? BundleCache.getSecureAction().isFileDirectory(file) : true);
     }
 
     public Enumeration getEntries()