diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 10:58:42 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 10:58:42 +1000 |
| commit | a026fd5e08d32d25e44add76384f823d35183c4f (patch) | |
| tree | a9deedeb96ec09780de1870e1cfd7ed13e5e6e8c /src/library | |
| parent | 344151f17b04bf75d6ebafec6aa4229dfe6cbf09 (diff) | |
| parent | 2cfac1a3516850a40728fefd8f808613d2e83f84 (diff) | |
| download | scala-a026fd5e08d32d25e44add76384f823d35183c4f.tar.gz scala-a026fd5e08d32d25e44add76384f823d35183c4f.tar.bz2 scala-a026fd5e08d32d25e44add76384f823d35183c4f.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20140930
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/rootdoc.txt | 2 | ||||
| -rw-r--r-- | src/library/scala/util/Properties.scala | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/library/rootdoc.txt b/src/library/rootdoc.txt index 4795a47efe..e84942b8c4 100644 --- a/src/library/rootdoc.txt +++ b/src/library/rootdoc.txt @@ -12,7 +12,7 @@ Notable packages include: - [[scala.collection.immutable `scala.collection.immutable`]] - Immutable, sequential data-structures such as [[scala.collection.immutable.Vector `Vector`]], [[scala.collection.immutable.List `List`]], [[scala.collection.immutable.Range `Range`]], [[scala.collection.immutable.HashMap `HashMap`]] or - [[scala.collection.immutable.HashSet `HasSet`]] + [[scala.collection.immutable.HashSet `HashSet`]] - [[scala.collection.mutable `scala.collection.mutable`]] - Mutable, sequential data-structures such as [[scala.collection.mutable.ArrayBuffer `ArrayBuffer`]], [[scala.collection.mutable.StringBuilder `StringBuilder`]], diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 8835730d95..367488f116 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -62,10 +62,10 @@ private[scala] trait PropertiesTrait { def envOrSome(name: String, alt: Option[String]) = envOrNone(name) orElse alt - // for values based on propFilename - def scalaPropOrElse(name: String, alt: String): String = scalaProps.getProperty(name, alt) + // for values based on propFilename, falling back to System properties + def scalaPropOrElse(name: String, alt: String): String = scalaPropOrNone(name).getOrElse(alt) def scalaPropOrEmpty(name: String): String = scalaPropOrElse(name, "") - def scalaPropOrNone(name: String): Option[String] = Option(scalaProps.getProperty(name)) + def scalaPropOrNone(name: String): Option[String] = Option(scalaProps.getProperty(name)).orElse(propOrNone("scala." + name)) /** The numeric portion of the runtime Scala version, if this is a final * release. If for instance the versionString says "version 2.9.0.final", |