From 12c375f9bd8eccf53b9ff2afc2f9e5c08b4008d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Karnok?= <akarnokd@gmail.com>
Date: Sun, 3 Apr 2016 01:07:44 +0200
Subject: [PATCH] 1.x: make defensive copy of the properties in RxJavaPlugins

---
 src/main/java/rx/plugins/RxJavaPlugins.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rx/plugins/RxJavaPlugins.java b/src/main/java/rx/plugins/RxJavaPlugins.java
index 6391a91185..acedd07449 100644
--- a/src/main/java/rx/plugins/RxJavaPlugins.java
+++ b/src/main/java/rx/plugins/RxJavaPlugins.java
@@ -200,7 +200,11 @@ public void registerSingleExecutionHook(RxJavaSingleExecutionHook impl) {
         }
     }
 
-    /* test */ static Object getPluginImplementationViaProperty(Class<?> pluginClass, Properties props) {
+    /* test */ static Object getPluginImplementationViaProperty(Class<?> pluginClass, Properties propsIn) {
+        // Make a defensive clone because traversal may fail with ConcurrentModificationException
+        // if the properties get changed by something outside RxJava.
+        Properties props = (Properties)propsIn.clone();
+        
         final String classSimpleName = pluginClass.getSimpleName();
         /*
          * Check system properties for plugin class.