diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-09-24 00:21:16 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-09-24 00:21:16 +0200 |
| commit | 269cb7bb875447304278db579dd8c41adcdb1689 (patch) | |
| tree | 4b1552e1f2bf0104d15b58442fe691c8df6ccc68 /src/library | |
| parent | 88bf17d267a48a4690b27e50b5d27d49fc6a3532 (diff) | |
| parent | 48caed547f364d7253eafa07839397c762a8796f (diff) | |
| download | scala-269cb7bb875447304278db579dd8c41adcdb1689.tar.gz scala-269cb7bb875447304278db579dd8c41adcdb1689.tar.bz2 scala-269cb7bb875447304278db579dd8c41adcdb1689.zip | |
Merge pull request #3994 from puffnfresh/feature/system-compiler-properties
Make compiler.properties fall back to prefixed
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 6 |
1 files changed, 3 insertions, 3 deletions
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", |