diff options
| author | Som Snytt <som.snytt@gmail.com> | 2015-03-02 23:09:47 -0800 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2015-03-02 23:53:28 -0800 |
| commit | 17caf79d158ca13776dff6d7461bba362b7a2f2f (patch) | |
| tree | 509806eae49225f555fcb97efaade0fa29a4fc26 /src/compiler/scala/tools/util/PathResolver.scala | |
| parent | 178e8df9b6a91375a6162721a0cbc2d90bcc7451 (diff) | |
| download | scala-17caf79d158ca13776dff6d7461bba362b7a2f2f.tar.gz scala-17caf79d158ca13776dff6d7461bba362b7a2f2f.tar.bz2 scala-17caf79d158ca13776dff6d7461bba362b7a2f2f.zip | |
SI-7775 Exclude nulls when iterating sys props
The previous fix to deal with concurrent modification of system
properties doesn't handle null results introduced when a property
is removed.
This commit filters nulls for safety, and also adds a `names`
method to `sys.SystemProperties`.
The test is upgraded.
Diffstat (limited to 'src/compiler/scala/tools/util/PathResolver.scala')
| -rw-r--r-- | src/compiler/scala/tools/util/PathResolver.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala index 8e5b1e0a5c..f122437b63 100644 --- a/src/compiler/scala/tools/util/PathResolver.scala +++ b/src/compiler/scala/tools/util/PathResolver.scala @@ -52,7 +52,7 @@ object PathResolver { */ object Environment { private def searchForBootClasspath = - systemProperties find (_._1 endsWith ".boot.class.path") map (_._2) getOrElse "" + systemProperties collectFirst { case (k, v) if k endsWith ".boot.class.path" => v } getOrElse "" /** Environment variables which java pays attention to so it * seems we do as well. |