svn commit: r1455679 - /cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java

[dkulp]

Author: dkulp
Date: Tue Mar 12 19:41:37 2013
New Revision: 1455679

URL: http://svn.apache.org/r1455679
Log:
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.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1455679&r1=1455678&r2=1455679&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 Tue Mar 12 19:41:37 2013
@@ -163,7 +163,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;
         }