Repository: cxf
Updated Branches:
  refs/heads/master a3f7f142a -> 6ad6cca54


There is no "bus" parameter on AsyncHTTPCOnduitFactory


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

Branch: refs/heads/master
Commit: 6ad6cca54710c50c8f565c94c65f29182d1be021
Parents: a3f7f14
Author: Daniel Kulp <[email protected]>
Authored: Wed Apr 16 10:33:17 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Wed Apr 16 10:33:17 2014 -0400

----------------------------------------------------------------------
 .../transport/http/asyncclient/AsyncHTTPConduitFactory.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/6ad6cca5/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
----------------------------------------------------------------------
diff --git 
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
 
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
index 83deeb0..cb2e389 100644
--- 
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
+++ 
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
@@ -23,8 +23,6 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Resource;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
@@ -65,7 +63,7 @@ import org.apache.http.protocol.HttpContext;
 /**
  * 
  */
-@NoJSR250Annotations(unlessNull = "bus")
+@NoJSR250Annotations
 public class AsyncHTTPConduitFactory implements HTTPConduitFactory {
     
     //TCP related properties
@@ -247,11 +245,6 @@ public class AsyncHTTPConduitFactory implements 
HTTPConduitFactory {
         return new AsyncHTTPConduit(bus, localInfo, target, this);
     }
 
-    @Resource 
-    public void setBus(Bus b) {
-        addListener(b);
-    }
-
     public void shutdown() {
         if (client != null) {
             shutdown(client);

Reply via email to