Author: dkulp Date: Tue Mar 12 19:51:15 2013 New Revision: 1455685 URL: http://svn.apache.org/r1455685 Log: Merged revisions 1455684 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1455684 | dkulp | 2013-03-12 15:46:07 -0400 (Tue, 12 Mar 2013) | 18 lines Merged revisions 1455679 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1455679 | dkulp | 2013-03-12 15:41:37 -0400 (Tue, 12 Mar 2013) | 10 lines Merged revisions 1455678 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1455678 | dkulp | 2013-03-12 15:39:11 -0400 (Tue, 12 Mar 2013) | 2 lines [CXF-4890] Fix problem if interface does not have @WebService annotation ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1455685&r1=1455684&r2=1455685&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Tue Mar 12 19:51:15 2013 @@ -171,7 +171,9 @@ public class JaxWsServiceConfiguration e if ((wm != null) && wm.exclude()) { return Boolean.FALSE; } - if ((wm != null && !wm.exclude()) || (cls.isInterface() + if ((wm != null && !wm.exclude()) + || (implInfo.getSEIClass() != null + && cls.isInterface() && cls.isAssignableFrom(implInfo.getSEIClass()))) { return Boolean.TRUE; }
