Author: ningjiang Date: Sun Oct 12 07:08:56 2008 New Revision: 703823 URL: http://svn.apache.org/viewvc?rev=703823&view=rev Log: Merged revisions 703820 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r703820 | ningjiang | 2008-10-12 21:53:49 +0800 (Sun, 12 Oct 2008) | 9 lines Merged revisions 703815 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r703815 | ningjiang | 2008-10-12 21:35:10 +0800 (Sun, 12 Oct 2008) | 1 line CXF-1857 set the invoker when ServiceFactoryBean create a new invoker. ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=703823&r1=703822&r2=703823&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Sun Oct 12 07:08:56 2008 @@ -108,7 +108,8 @@ if (invoker != null) { getServiceFactory().setInvoker(invoker); } else if (serviceBean != null) { - getServiceFactory().setInvoker(createInvoker()); + invoker = createInvoker(); + getServiceFactory().setInvoker(invoker); } Endpoint ep = createEndpoint(); @@ -228,9 +229,9 @@ } /** - * Specifies if the Server should be started upon creation. The - * default is for Servers to be started upon creation. Passing - * <code>false</code> tells the factory that the Server will be + * Specifies if the Server should be started upon creation. The + * default is for Servers to be started upon creation. Passing + * <code>false</code> tells the factory that the Server will be * started manually using the start method. * * @param start <code>false</code> specifies that the Server will not be started upon creation @@ -252,7 +253,7 @@ } /** - * Sets the bean implementing the service. If this is set a + * Sets the bean implementing the service. If this is set a * <code>BeanInvoker</code> is created for the provided bean. * * @param serviceBean an instantiated implementaiton object @@ -278,12 +279,12 @@ } /** - * Specifies the location of the WSDL defining the service interface - * used by the factory to create services. Typically, the WSDL + * Specifies the location of the WSDL defining the service interface + * used by the factory to create services. Typically, the WSDL * location is specified as a URL. - * + * * @param locaiton the URL of the WSDL defining the service interface - */ + */ public void setWsdlLocation(String location) { setWsdlURL(location); }
