File tree Expand file tree Collapse file tree 1 file changed +7
-13
lines changed
language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/subscriptions Expand file tree Collapse file tree 1 file changed +7
-13
lines changed Original file line number Diff line number Diff line change @@ -35,21 +35,15 @@ object SerialSubscription {
35
35
/**
36
36
* Represents a [[rx.lang.scala.Subscription ]] that can be checked for status.
37
37
*/
38
- class SerialSubscription private [scala] (serial : rx.subscriptions.SerialSubscription ) extends Subscription {
38
+ class SerialSubscription private [scala] (override val asJavaSubscription : rx.subscriptions.SerialSubscription ) extends Subscription {
39
39
40
- /*
41
- * As long as rx.subscriptions.SerialSubscription has no isUnsubscribed,
42
- * we need to intercept and do it ourselves.
43
- */
44
- override val asJavaSubscription : rx.subscriptions.SerialSubscription = new rx.subscriptions.SerialSubscription () {
45
- override def unsubscribe (): Unit = {
46
- if (unsubscribed.compareAndSet(false , true )) { serial.unsubscribe() }
47
- }
48
- override def setSubscription (subscription : rx.Subscription ): Unit = serial.setSubscription(subscription)
49
- override def getSubscription (): rx.Subscription = serial.getSubscription()
50
- }
40
+ override def unsubscribe (): Unit = asJavaSubscription.unsubscribe()
41
+ override def isUnsubscribed : Boolean = asJavaSubscription.isUnsubscribed
51
42
52
- def subscription_= (value : Subscription ): this .type = { asJavaSubscription.setSubscription(value.asJavaSubscription); this }
43
+ def subscription_= (value : Subscription ): this .type = {
44
+ asJavaSubscription.setSubscription(value.asJavaSubscription)
45
+ this
46
+ }
53
47
def subscription : Subscription = Subscription (asJavaSubscription.getSubscription)
54
48
55
49
}
You can’t perform that action at this time.
0 commit comments