This is an automated email from the ASF dual-hosted git repository.
amccright pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new 846868b Backport createClientProxy change from master (3.2)
846868b is described below
commit 846868b7543263ebb6102765ba50ee54bf7daedf
Author: Andy McCright <[email protected]>
AuthorDate: Thu Jan 11 09:16:05 2018 -0600
Backport createClientProxy change from master (3.2)
---
.../cxf/jaxrs/client/JAXRSClientFactoryBean.java | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
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 ce813b5..7936733 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
@@ -308,15 +308,7 @@ public class JAXRSClientFactoryBean extends
AbstractJAXRSFactoryBean {
boolean isRoot = cri.getURITemplate() != null;
ClientProxyImpl proxyImpl = null;
ClientState actualState = getActualState();
- if (actualState == null) {
- proxyImpl =
- new ClientProxyImpl(URI.create(getAddress()), proxyLoader,
cri, isRoot,
- inheritHeaders, varValues);
- } else {
- proxyImpl =
- new ClientProxyImpl(actualState, proxyLoader, cri, isRoot,
- inheritHeaders, varValues);
- }
+ proxyImpl = createClientProxy(cri, isRoot, actualState, varValues);
initClient(proxyImpl, ep, actualState == null);
ClassLoader theLoader = proxyLoader == null ?
cri.getServiceClass().getClassLoader() : proxyLoader;
@@ -343,6 +335,17 @@ public class JAXRSClientFactoryBean extends
AbstractJAXRSFactoryBean {
}
+ protected ClientProxyImpl createClientProxy(ClassResourceInfo cri, boolean
isRoot,
+ ClientState actualState,
Object[] varValues) {
+ if (actualState == null) {
+ return new ClientProxyImpl(URI.create(getAddress()), proxyLoader,
cri, isRoot,
+ inheritHeaders, varValues);
+ } else {
+ return new ClientProxyImpl(actualState, proxyLoader, cri, isRoot,
+ inheritHeaders, varValues);
+ }
+ }
+
protected ConduitSelector getConduitSelector(Endpoint ep) {
ConduitSelector cs = getConduitSelector();
if (cs == null) {
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
