Author: dkulp
Date: Wed Sep 11 18:06:37 2013
New Revision: 1521963
URL: http://svn.apache.org/r1521963
Log:
Merged revisions 1521953 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1521953 | dkulp | 2013-09-11 13:56:16 -0400 (Wed, 11 Sep 2013) | 2 lines
[CXF-5271] Fix when the CLIENT_CREATED event is fired
........
Modified:
cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
Modified:
cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=1521963&r1=1521962&r2=1521963&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
Wed Sep 11 18:06:37 2013
@@ -86,8 +86,9 @@ public class ClientFactoryBean extends A
getServiceFactory().getProperties().putAll(properties);
}
Client client = null;
+ Endpoint ep = null;
try {
- Endpoint ep = createEndpoint();
+ ep = createEndpoint();
applyProperties(ep);
client = createClient(ep);
initializeAnnotationInterceptors(ep, getServiceClass());
@@ -97,13 +98,12 @@ public class ClientFactoryBean extends A
throw new ServiceConstructionException(e);
}
applyFeatures(client);
+
this.getServiceFactory().sendEvent(FactoryBeanListener.Event.CLIENT_CREATED,
client, ep);
return client;
}
protected Client createClient(Endpoint ep) {
- Client client = new ClientImpl(getBus(), ep, getConduitSelector());
-
this.getServiceFactory().sendEvent(FactoryBeanListener.Event.CLIENT_CREATED,
client, ep);
- return client;
+ return new ClientImpl(getBus(), ep, getConduitSelector());
}
protected void applyFeatures(Client client) {
