Migrate Merge from Synchronize to Serialize

Author: benjchristensen

rxjava-core/src/main/java/rx/observers/SerializedObserver.java

@@ -11,9 +11,9 @@
 public class SerializedObserver<T> implements Observer<T> {
 
     private final AtomicReference<State> state = new AtomicReference<State>(State.createNew());
-    private final Observer<T> s;
+    private final Observer<? super T> s;
 
-    public SerializedObserver(Observer<T> s) {
+    public SerializedObserver(Observer<? super T> s) {
         this.s = s;
     }
 

rxjava-core/src/main/java/rx/observers/SerializedSubscriber.java

@@ -7,7 +7,7 @@ public class SerializedSubscriber<T> extends Subscriber<T> {
 
     private final Observer<T> s;
 
-    public SerializedSubscriber(Subscriber<T> s) {
+    public SerializedSubscriber(Subscriber<? super T> s) {
         this.s = new SerializedObserver<T>(s);
     }
 

rxjava-core/src/main/java/rx/operators/OperatorMerge.java

@@ -20,7 +20,7 @@
 import rx.Observable;
 import rx.Observable.Operator;
 import rx.Subscriber;
-import rx.observers.SynchronizedSubscriber;
+import rx.observers.SerializedSubscriber;
 import rx.subscriptions.CompositeSubscription;
 
 /**
@@ -36,7 +36,7 @@ public final class OperatorMerge<T> implements Operator<T, Observable<? extends
     @Override
     public Subscriber<Observable<? extends T>> call(final Subscriber<? super T> outerOperation) {
 
-        final Subscriber<T> o = new SynchronizedSubscriber<T>(outerOperation);
+        final Subscriber<T> o = new SerializedSubscriber<T>(outerOperation);
         final CompositeSubscription childrenSubscriptions = new CompositeSubscription();
         outerOperation.add(childrenSubscriptions);