Author: mmao
Date: Thu Dec 27 04:13:37 2007
New Revision: 607046

URL: http://svn.apache.org/viewvc?rev=607046&view=rev
Log:
CXF-1343
 * Feature can not be applied if the portName is NULL


Modified:
    
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
    
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
    
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java

Modified: 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=607046&r1=607045&r2=607046&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
 Thu Dec 27 04:13:37 2007
@@ -309,6 +309,7 @@
         JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean();
         JaxWsClientFactoryBean clientFac = (JaxWsClientFactoryBean) 
proxyFac.getClientFactoryBean();
         JaxWsServiceFactoryBean serviceFactory = (JaxWsServiceFactoryBean) 
proxyFac.getServiceFactory();
+        proxyFac.initFeatures();
         serviceFactory.setWsFeatures(Arrays.asList(features));
         
         proxyFac.setBus(bus);

Modified: 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=607046&r1=607045&r2=607046&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
 Thu Dec 27 04:13:37 2007
@@ -54,13 +54,13 @@
     
     protected AbstractWSDLBasedEndpointFactory(ReflectionServiceFactoryBean 
sbean) {
         serviceFactory = sbean;
+        //serviceFactory.setFeatures(getFeatures());
     }
     protected AbstractWSDLBasedEndpointFactory() {
     }
     
-    protected Endpoint createEndpoint() throws BusException, EndpointException 
{
+    protected Endpoint createEndpoint() throws BusException, EndpointException 
{        
         serviceFactory.setFeatures(getFeatures());
-
         if (serviceName != null) {
             serviceFactory.setServiceName(serviceName);
         }

Modified: 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=607046&r1=607045&r2=607046&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
 Thu Dec 27 04:13:37 2007
@@ -63,7 +63,12 @@
     }
     public ClientProxyFactoryBean(ClientFactoryBean fact) {
         super();
-        this.clientFactoryBean = fact;
+        this.clientFactoryBean = fact;        
+    }
+    
+    public void initFeatures() {
+        this.clientFactoryBean.setFeatures(features);
+        this.getServiceFactory().setFeatures(features);
     }
 
     public Object create() {
@@ -78,7 +83,7 @@
             properties.put(AuthorizationPolicy.class.getName(), authPolicy);
         }
         
-        clientFactoryBean.setFeatures(features);
+        initFeatures();                
         clientFactoryBean.setProperties(properties);
         
         if (bus != null) {


Reply via email to