Skip to content

Commit 728f183

Browse files
Removed local SerialSubscription isUnsubscribed implementation since underlying subscription now implements it.
1 parent cf494e8 commit 728f183

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/subscriptions/SerialSubscription.scala

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,15 @@ object SerialSubscription {
3535
/**
3636
* Represents a [[rx.lang.scala.Subscription]] that can be checked for status.
3737
*/
38-
class SerialSubscription private[scala] (serial: rx.subscriptions.SerialSubscription) extends Subscription {
38+
class SerialSubscription private[scala] (override val asJavaSubscription: rx.subscriptions.SerialSubscription) extends Subscription {
3939

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
5142

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+
}
5347
def subscription: Subscription = Subscription(asJavaSubscription.getSubscription)
5448

5549
}

0 commit comments

Comments
 (0)