You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/04/08 15:11:04 UTC
cxf git commit: [CXF-6336] Checking the factpry on the endpoint
Repository: cxf
Updated Branches:
refs/heads/master 9fce658c4 -> 8de3bacf5
[CXF-6336] Checking the factpry on the endpoint
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8de3bacf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8de3bacf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8de3bacf
Branch: refs/heads/master
Commit: 8de3bacf5312d8633c1978464250658e027d7d8c
Parents: 9fce658
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Apr 8 14:10:50 2015 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Apr 8 14:10:50 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/cxf/jaxrs/client/AbstractClient.java | 2 +-
.../java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java | 4 ----
.../java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java | 3 ---
3 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8de3bacf/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 9df7940..0826a41 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -722,7 +722,7 @@ public abstract class AbstractClient implements Client {
if (pValue == null) {
return null;
}
- ProviderFactory pf = ClientProviderFactory.getInstance(cfg.getBus());
+ ProviderFactory pf = ClientProviderFactory.getInstance(cfg.getEndpoint());
if (pf != null) {
Class<?> pClass = pValue.getClass();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8de3bacf/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
index 2764756..65055a4 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
@@ -59,10 +59,6 @@ public final class ClientProviderFactory extends ProviderFactory {
return factory;
}
- public static ClientProviderFactory getInstance(Bus bus) {
- return (ClientProviderFactory)bus.getProperty(CLIENT_FACTORY_NAME);
- }
-
public static ClientProviderFactory getInstance(Message m) {
Endpoint e = m.getExchange().get(Endpoint.class);
return (ClientProviderFactory)e.get(CLIENT_FACTORY_NAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8de3bacf/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
index d41a76e..936c43d 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
@@ -398,9 +398,6 @@ public class JAXRSClientFactoryBean extends AbstractJAXRSFactoryBean {
});
}
- getBus().setProperty(ClientProviderFactory.class.getName(), factory);
-
-
}
protected void applyFeatures(AbstractClient client) {