luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1881. Clone SystemProperties defending against ConcurrentModificationException

This commit is contained in:
Allan Erskine 2015-02-28 23:46:02 -05:00
parent 4c69f5abd4
commit 24d2a2024b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/src/main/scala/sbt/JUnitXmlTestsListener.scala
View File

@ -2,6 +2,7 @@ package sbt
import java.io.{ IOException, StringWriter, PrintWriter, File } import java.io.{ IOException, StringWriter, PrintWriter, File }
import java.net.InetAddress import java.net.InetAddress
import java.util.Hashtable
import scala.collection.mutable.ListBuffer import scala.collection.mutable.ListBuffer
import scala.util.DynamicVariable import scala.util.DynamicVariable
@ -27,7 +28,9 @@ class JUnitXmlTestsListener(val outputDir: String) extends TestsListener {
val properties = val properties =
<properties> <properties>
{ {
val iter = System.getProperties.entrySet.iterator // create a clone, defending against [[ConcurrentModificationException]]
val clonedProperties = System.getProperties.clone.asInstanceOf[Hashtable[AnyRef, AnyRef]]
val iter = clonedProperties.entrySet.iterator
val props: ListBuffer[XNode] = new ListBuffer() val props: ListBuffer[XNode] = new ListBuffer()
while (iter.hasNext) { while (iter.hasNext) {
val next = iter.next val next = iter.next