You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/06/14 12:23:38 UTC
svn commit: r1135465 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
Author: ffang
Date: Tue Jun 14 10:23:38 2011
New Revision: 1135465
URL: http://svn.apache.org/viewvc?rev=1135465&view=rev
Log:
Merged revisions 1135457 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1135457 | ffang | 2011-06-14 18:12:08 +0800 (二, 14 6 2011) | 1 line
[CXF-3585]WSDLGetInterceptor throws NullPointException when using EndpointSelectionInterceptor
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 14 10:23:38 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1135457
Modified: cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java?rev=1135465&r1=1135464&r2=1135465&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java Tue Jun 14 10:23:38 2011
@@ -52,6 +52,7 @@ import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
+import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
import org.apache.cxf.common.logging.LogUtils;
@@ -89,6 +90,7 @@ public class WSDLGetInterceptor extends
public WSDLGetInterceptor() {
super(Phase.READ);
+ getAfter().add(EndpointSelectionInterceptor.class.getName());
}
public void handleMessage(Message message) throws Fault {