cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6336] Checking the factpry on the endpoint
Date Wed, 08 Apr 2015 15:39:50 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 852c93b83 -> 901ea552d


[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/901ea552
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/901ea552
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/901ea552

Branch: refs/heads/2.7.x-fixes
Commit: 901ea552d2b10905cd767d5d12c47f8fa5632534
Parents: 852c93b
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Apr 8 14:10:50 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Apr 8 16:39:19 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/client/AbstractClient.java     | 2 +-
 .../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/901ea552/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index d74fe3d..f1f7ee3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -733,7 +733,7 @@ public abstract class AbstractClient implements Client, Retryable {
         if (pValue == null) {
             return null;
         }
-        ProviderFactory pf = ProviderFactory.getInstance(cfg.getBus());
+        ProviderFactory pf = ProviderFactory.getInstance(cfg.getEndpoint());
         if (pf != null) {
             Class<?> pClass = pValue.getClass();
             @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/cxf/blob/901ea552/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 4602037..9b41ae9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -242,12 +242,12 @@ public final class ProviderFactory {
         return new ProviderFactory(bus);
     }
     
-    public static ProviderFactory getInstance(Bus bus) {
-        return (ProviderFactory)bus.getProperty(ProviderFactory.class.getName());
-    }
-    
     public static ProviderFactory getInstance(Message m) {
         Endpoint e = m.getExchange().get(Endpoint.class);
+        return getInstance(e);
+    }
+    
+    public static ProviderFactory getInstance(Endpoint e) {
         return (ProviderFactory)e.get(ProviderFactory.class.getName());
     }
     


Mime
View raw message