svn commit: r948149 - in /cxf/branches/2.2.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java

[dkulp]

Author: dkulp
Date: Tue May 25 18:20:20 2010
New Revision: 948149

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

........
  r946824 | dkulp | 2010-05-20 19:34:31 -0400 (Thu, 20 May 2010) | 1 line
  
  If the action is empty, don't output an annotation
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java

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

Modified: 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java?rev=948149&r1=948148&r2=948149&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java
 Tue May 25 18:20:20 2010
@@ -61,7 +61,10 @@ public final class WSActionAnnotator imp
             action = (QName)mi.getExtensionAttribute(WSAW_OLD_ACTION_QNAME);
         }
         if (action != null) {
-            return action.getLocalPart();
+            String s = action.getLocalPart();
+            if (!StringUtils.isEmpty(s)) {
+                return s;
+            }
         } 
         return null;
     }