Skip to content

Commit

Permalink
[SPARK-4952][Core]Handle ConcurrentModificationExceptions in SparkEnv…
Browse files Browse the repository at this point in the history
….environmentDetails

Author: GuoQiang Li <[email protected]>

Closes apache#3788 from witgo/SPARK-4952 and squashes the following commits:

d903529 [GuoQiang Li] Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails
  • Loading branch information
witgo authored and pwendell committed Dec 27, 2014
1 parent 786808a commit 080ceb7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/SparkEnv.scala
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ object SparkEnv extends Logging {
val sparkProperties = (conf.getAll ++ schedulerMode).sorted

// System properties that are not java classpaths
val systemProperties = System.getProperties.iterator.toSeq
val systemProperties = Utils.getSystemProperties.toSeq
val otherProperties = systemProperties.filter { case (k, _) =>
k != "java.class.path" && !k.startsWith("spark.")
}.sorted
Expand Down

0 comments on commit 080ceb7

Please sign in to comment.