commit ae369e1738f81cbcf6118adac03ec0e8bcbb8400
author Kalle Raita <kraita@google.com> Sat Apr 15 22:30:36 2017 -0700
committer Kalle Raita <kraita@google.com> Mon Apr 17 09:15:23 2017 -0700
tree 669a2c6610ec6eea6bfb5ff2ef686c5ff6be244c
parent 8bc2748f2850c88ab6b86c6ceed1ce65bed5ee16

Clone System properties before iterating

Iterating over the live set retrieved from System.getProperties() can
cause trouble as any modification to the System properties during
iteration here will trigger concurrent modification exception. It's
safer to first clone the live set and iterate over the clone.

Bug: 36820084
Test: 40000 iterations of CTS unit tests
Change-Id: I647a6cc8ab9d3a51204e635bfd3250c035a77e68

src/org/easymock/internal/EasyMockProperties.java

diff --git a/src/org/easymock/internal/EasyMockProperties.java b/src/org/easymock/internal/EasyMockProperties.java
index 5094104..5043095 100644
--- a/src/org/easymock/internal/EasyMockProperties.java
+++ b/src/org/easymock/internal/EasyMockProperties.java
@@ -73,8 +73,8 @@
             }

         }

         // Then overload it with system properties

-        for (Map.Entry<Object, Object> entry : System.getProperties()

-                .entrySet()) {

+        for (Map.Entry<Object, Object> entry : ((Properties)System.getProperties()

+                 .clone()).entrySet()) {

             if (entry.getKey() instanceof String

                     && entry.getKey().toString().startsWith(PREFIX)) {

                 properties.put(entry.getKey(), entry.getValue());