svn commit: r1417172 - /cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java

[dkulp]

Author: dkulp
Date: Tue Dec  4 20:56:39 2012
New Revision: 1417172

URL: http://svn.apache.org/viewvc?rev=1417172&view=rev
Log:
Merged revisions 1417098 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1417098 | asoldano | 2012-12-04 13:31:51 -0500 (Tue, 04 Dec 2012) | 2 lines

  [CXF-4674] Early consume publishedEndpointUrl information

........

Modified:
    
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java

Modified: 
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1417172&r1=1417171&r2=1417172&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
 Tue Dec  4 20:56:39 2012
@@ -344,7 +344,7 @@ public class EndpointImpl extends javax.
                     Definition def = endpointInfo.getService()
                         .getProperty(WSDLServiceBuilder.WSDL_DEFINITION, 
Definition.class);
                     if (def == null) {
-                        
bus.getExtension(WSDLManager.class).getDefinition(wsdlLocation);
+                        def = 
bus.getExtension(WSDLManager.class).getDefinition(wsdlLocation);
                     }
                     new WSDLGetUtils().updateWSDLPublishedEndpointAddress(def, 
endpointInfo);
                 }