summaryrefslogtreecommitdiff
path: root/src/reflect/scala/reflect/io
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-05-15 04:04:06 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-05-15 04:04:06 -0700
commit03ef18f649a2134b8995e953691c88616961439d (patch)
tree70e8d1d5077e0d88896f1bee6447e4c6f7ba2cf5 /src/reflect/scala/reflect/io
parentb29a9924fec4c0558856ea70e94bb525f5cc7a0e (diff)
parentabc314ac845eef2b6b26faf37f4aad69e0d121f7 (diff)
downloadscala-03ef18f649a2134b8995e953691c88616961439d.tar.gz
scala-03ef18f649a2134b8995e953691c88616961439d.tar.bz2
scala-03ef18f649a2134b8995e953691c88616961439d.zip
Merge pull request #2399 from rjolly/scripting8
AbstractFile.getDirectory does not return null when outDir is "."
Diffstat (limited to 'src/reflect/scala/reflect/io')
-rw-r--r--src/reflect/scala/reflect/io/Path.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/io/Path.scala b/src/reflect/scala/reflect/io/Path.scala
index 0da962955c..15fce953f2 100644
--- a/src/reflect/scala/reflect/io/Path.scala
+++ b/src/reflect/scala/reflect/io/Path.scala
@@ -209,7 +209,7 @@ class Path private[io] (val jfile: JFile) {
}
def isDirectory = {
if (Statistics.canEnable) Statistics.incCounter(IOStats.fileIsDirectoryCount)
- try jfile.isDirectory() catch { case ex: SecurityException => false }
+ try jfile.isDirectory() catch { case ex: SecurityException => jfile.getPath == "." }
}
def isAbsolute = jfile.isAbsolute()
def isEmpty = path.length == 0