Fix Scala Build

ReactiveX · Jan 31, 2014 · 171ebc0 · 171ebc0
1 parent 99f32ab
commit 171ebc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Subject.scala b/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Subject.scala
@@ -21,7 +21,7 @@ package rx.lang.scala
 trait Subject[T] extends Observable[T] with Observer[T] {
   private [scala] val asJavaSubject: rx.subjects.Subject[_ >: T, _<: T]
 
-  val asJavaObservable: rx.Observable[_ <: T] = asJavaSubject.toObservable()
+  val asJavaObservable: rx.Observable[_ <: T] = asJavaSubject
 
   override val asJavaObserver: rx.Observer[_ >: T] = asJavaSubject
   override def onNext(value: T): Unit = { asJavaObserver.onNext(value)}

diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
@@ -6840,6 +6840,10 @@ public final Subscription subscribe(final Action1<? super T> onNext, Scheduler s
         return subscribeOn(scheduler).subscribe(onNext);
     }
 
+    public final Subscription subscribe(final Observer<? super T> observer, Scheduler scheduler) {
+        return subscribeOn(scheduler).subscribe(observer);
+    }
+
     public final Subscription subscribe(final Observer<? super T> observer) {
         return subscribe(new Subscriber<T>() {