svn commit: r1233178 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java

[ffang]

Author: ffang
Date: Thu Jan 19 05:07:29 2012
New Revision: 1233178

URL: http://svn.apache.org/viewvc?rev=1233178&view=rev
Log:
Merged revisions 1233171 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1233171 | ffang | 2012-01-19 12:51:21 +0800 (四, 19  1 2012) | 1 line
  
  [CXF-4044]ensure publishedEndpointUrl property could be set to endpoint
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=1233178&r1=1233177&r2=1233178&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
 Thu Jan 19 05:07:29 2012
@@ -157,6 +157,10 @@ public abstract class AbstractWSDLBasedE
             ei.setAddress(getAddress()); 
         }
 
+        if (publishedEndpointUrl != null && !"".equals(publishedEndpointUrl)) {
+            ei.setProperty("publishedEndpointUrl", publishedEndpointUrl);
+        }
+        
         if (endpointReference != null) {
             ei.setAddress(endpointReference);
         }
@@ -294,10 +298,6 @@ public abstract class AbstractWSDLBasedE
         ei.setAddress(getAddress());
         ei.setBinding(bindingInfo);
         
-        if (publishedEndpointUrl != null && !"".equals(publishedEndpointUrl)) {
-            ei.setProperty("publishedEndpointUrl", publishedEndpointUrl);
-        }
-
         if (wsdlEndpointFactory != null) {
             wsdlEndpointFactory.createPortExtensors(ei, service);
         }