camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject git commit: Upgraded to RxJava 0.19.1.
Date Mon, 23 Jun 2014 17:52:51 GMT
Repository: camel
Updated Branches:
  refs/heads/master 3ed03b873 -> d18e8b4ac


Upgraded to RxJava 0.19.1.

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d18e8b4a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d18e8b4a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d18e8b4a

Branch: refs/heads/master
Commit: d18e8b4ac4ac60bdd28b2a3009eb9afac6bb2f63
Parents: 3ed03b8
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Mon Jun 23 19:52:45 2014 +0200
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Mon Jun 23 19:52:45 2014 +0200

----------------------------------------------------------------------
 .../apache/camel/rx/support/EndpointSubscribeFunc.java   | 11 ++---------
 parent/pom.xml                                           |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d18e8b4a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
index d118f5a..240debf 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
@@ -19,12 +19,10 @@ package org.apache.camel.rx.support;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import rx.Observable;
-import rx.Observer;
 import rx.Subscriber;
-import rx.Subscription;
 import rx.functions.Func1;
 
-public class EndpointSubscribeFunc<T> implements Observable.OnSubscribeFunc<T>,
Observable.OnSubscribe<T> {
+public class EndpointSubscribeFunc<T> implements Observable.OnSubscribe<T> {
 
     private final Endpoint endpoint;
     private final Func1<Exchange, T> converter;
@@ -35,12 +33,7 @@ public class EndpointSubscribeFunc<T> implements Observable.OnSubscribeFunc<T>,
     }
 
     @Override
-    public Subscription onSubscribe(Observer<? super T> observer) {
-        return new EndpointSubscription<T>(endpoint, observer, converter);
-    }
-
-    @Override
     public void call(Subscriber<? super T> subscriber) {
-        onSubscribe(subscriber);
+        new EndpointSubscription<T>(endpoint, subscriber, converter);
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/d18e8b4a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 563fa09..036561d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -347,7 +347,7 @@
     <rhino-version>1.7R2</rhino-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>
     <rome-version>1.0</rome-version>
-    <rxjava-version>0.17.5</rxjava-version>
+    <rxjava-version>0.19.1</rxjava-version>
     <saaj-impl-version>1.3.2_2</saaj-impl-version>
     <saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
     <saxon-version>9.5.1-5</saxon-version>


Mime
View raw message