dev

Author: davidmoten

src/main/java/rx/internal/operators/OperatorToMap.java

@@ -152,4 +152,35 @@ public void onCompleted() {
             }
         };
     }
+    
+    static final class ToMapSubscriber<T, K, V> extends DeferredScalarSubscriberSafe<T, Map<K,V>> {
+
+        private final Func1<? super T, ? extends K> keySelector;
+        private final Func1<? super T, ? extends V> valueSelector;
+
+        ToMapSubscriber(Subscriber<? super Map<K,V>> actual, Map<K,V> initialValue, Func1<? super T, ? extends K> keySelector,
+                Func1<? super T, ? extends V> valueSelector) {
+            super(actual);
+            this.value = initialValue;
+            this.hasValue = true;
+            this.keySelector = keySelector;
+            this.valueSelector = valueSelector;
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (done) {
+                return;
+            }
+            try {
+                K key = keySelector.call(t);
+                V val = valueSelector.call(t);
+                value.put(key, val);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                unsubscribe();
+                onError(ex);
+            }
+        }
+    }
 }

src/test/java/rx/internal/operators/OperatorToMapTest.java

@@ -369,7 +369,7 @@ public Integer call(Integer t) {
             assertEquals(Arrays.asList(e2), list);
             ts.assertNotCompleted();
         } finally {
-            RxJavaHooks.setOnError(null);
+            RxJavaHooks.reset();
         }
     }