File tree Expand file tree Collapse file tree 3 files changed +6
-13
lines changed
rxjava-core/src/main/java/rx/subjects Expand file tree Collapse file tree 3 files changed +6
-13
lines changed Original file line number Diff line number Diff line change 15
15
*/
16
16
package rx .subjects ;
17
17
18
- import static org .mockito .Matchers .any ;
19
- import static org .mockito .Mockito .mock ;
20
- import static org .mockito .Mockito .times ;
21
- import static org .mockito .Mockito .verify ;
22
- import static org .mockito .Matchers .anyString ;
18
+ import static org .mockito .Matchers .*;
19
+ import static org .mockito .Mockito .*;
23
20
24
21
import java .util .concurrent .ConcurrentHashMap ;
25
22
import java .util .concurrent .atomic .AtomicReference ;
30
27
import rx .Observer ;
31
28
import rx .Subscription ;
32
29
import rx .util .AtomicObservableSubscription ;
33
- import rx .util .SynchronizedObserver ;
34
30
import rx .util .functions .Action1 ;
35
31
import rx .util .functions .Func0 ;
36
32
import rx .util .functions .Func1 ;
@@ -80,7 +76,7 @@ public void unsubscribe() {
80
76
});
81
77
82
78
// on subscribe add it to the map of outbound observers to notify
83
- observers .put (subscription , new SynchronizedObserver < T >( observer , subscription ) );
79
+ observers .put (subscription , observer );
84
80
return subscription ;
85
81
}
86
82
};
Original file line number Diff line number Diff line change 27
27
import rx .Observer ;
28
28
import rx .Subscription ;
29
29
import rx .util .AtomicObservableSubscription ;
30
- import rx .util .SynchronizedObserver ;
31
30
import rx .util .functions .Action1 ;
32
31
import rx .util .functions .Func0 ;
33
32
import rx .util .functions .Func1 ;
@@ -86,11 +85,10 @@ public void unsubscribe() {
86
85
}
87
86
});
88
87
89
- SynchronizedObserver <T > synchronizedObserver = new SynchronizedObserver <T >(observer , subscription );
90
- synchronizedObserver .onNext (currentValue .get ());
88
+ observer .onNext (currentValue .get ());
91
89
92
90
// on subscribe add it to the map of outbound observers to notify
93
- observers .put (subscription , synchronizedObserver );
91
+ observers .put (subscription , observer );
94
92
return subscription ;
95
93
}
96
94
};
Original file line number Diff line number Diff line change 34
34
import rx .Observer ;
35
35
import rx .Subscription ;
36
36
import rx .util .AtomicObservableSubscription ;
37
- import rx .util .SynchronizedObserver ;
38
37
import rx .util .functions .Action1 ;
39
38
import rx .util .functions .Func0 ;
40
39
import rx .util .functions .Func1 ;
@@ -78,7 +77,7 @@ public void unsubscribe() {
78
77
});
79
78
80
79
// on subscribe add it to the map of outbound observers to notify
81
- observers .put (subscription , new SynchronizedObserver < T >( observer , subscription ) );
80
+ observers .put (subscription , observer );
82
81
return subscription ;
83
82
}
84
83
};
You can’t perform that action at this time.
0 commit comments