diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-09 13:58:26 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-09 13:58:26 -0800 |
| commit | 27988cac0aaa681b8dfa8cd8e1fc4f4dd491e812 (patch) | |
| tree | f65d92ae534a7fb9e4ac882c6d3657efbd2492b8 /src | |
| parent | e8365dedf7a42382b337d644e35cb405183ed2b2 (diff) | |
| parent | f2d0231898a4537218656867e9356e09d05d3a85 (diff) | |
| download | scala-27988cac0aaa681b8dfa8cd8e1fc4f4dd491e812.tar.gz scala-27988cac0aaa681b8dfa8cd8e1fc4f4dd491e812.tar.bz2 scala-27988cac0aaa681b8dfa8cd8e1fc4f4dd491e812.zip | |
Merge pull request #4280 from kanielc/SI-9095
SI-9095 Memory leak in LinkedHasMap and LinkedHashSet
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/collection/mutable/LinkedHashMap.scala | 1 | ||||
| -rw-r--r-- | src/library/scala/collection/mutable/LinkedHashSet.scala | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index b64504be3d..275f490675 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -160,6 +160,7 @@ class LinkedHashMap[A, B] extends AbstractMap[A, B] override def clear() { clearTable() firstEntry = null + lastEntry = null } private def writeObject(out: java.io.ObjectOutputStream) { diff --git a/src/library/scala/collection/mutable/LinkedHashSet.scala b/src/library/scala/collection/mutable/LinkedHashSet.scala index 1768c946ed..756a2f73c1 100644 --- a/src/library/scala/collection/mutable/LinkedHashSet.scala +++ b/src/library/scala/collection/mutable/LinkedHashSet.scala @@ -112,6 +112,7 @@ class LinkedHashSet[A] extends AbstractSet[A] override def clear() { clearTable() firstEntry = null + lastEntry = null } private def writeObject(out: java.io.ObjectOutputStream) { |