summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2013-05-10 21:51:29 +0200
committerEugene Burmako <xeno.by@gmail.com>2013-05-11 10:15:34 +0200
commit5751ddd9eee0573dcf889983b423397fb6670415 (patch)
tree33c1becad9b50c826fe769367af00842798cf2e6 /src/reflect
parent75a3b88c697d485a321429a7526c823f1b4bfc8e (diff)
downloadscala-5751ddd9eee0573dcf889983b423397fb6670415.tar.gz
scala-5751ddd9eee0573dcf889983b423397fb6670415.tar.bz2
scala-5751ddd9eee0573dcf889983b423397fb6670415.zip
pull request feedback
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/runtime/ReflectionUtils.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/runtime/ReflectionUtils.scala b/src/reflect/scala/reflect/runtime/ReflectionUtils.scala
index 3ee53eb7a1..33ad6d2430 100644
--- a/src/reflect/scala/reflect/runtime/ReflectionUtils.scala
+++ b/src/reflect/scala/reflect/runtime/ReflectionUtils.scala
@@ -42,7 +42,8 @@ private[scala] object ReflectionUtils {
case cl if cl != null && isAbstractFileClassLoader(cl.getClass) =>
cl.asInstanceOf[{val root: scala.reflect.io.AbstractFile}].root.canonicalPath
case null =>
- scala.util.Properties.propOrEmpty("sun.boot.class.path")
+ val loadBootCp = (flavor: String) => scala.util.Properties.propOrNone(flavor + ".boot.class.path")
+ loadBootCp("sun") orElse loadBootCp("java") getOrElse "<unknown>"
case _ =>
"<unknown>"
}