You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/10/19 21:05:00 UTC
svn commit: r1186407 - in /cxf/branches/2.3.x-fixes: ./
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
Author: dkulp
Date: Wed Oct 19 19:05:00 2011
New Revision: 1186407
URL: http://svn.apache.org/viewvc?rev=1186407&view=rev
Log:
Merged revisions 1186396 via svnmerge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1186396 | dkulp | 2011-10-19 14:51:22 -0400 (Wed, 19 Oct 2011) | 9 lines
Merged revisions 1186385 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1186385 | dkulp | 2011-10-19 14:27:13 -0400 (Wed, 19 Oct 2011) | 1 line
[CXF-3829] Add and NPE guard
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?rev=1186407&r1=1186406&r2=1186407&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java Wed Oct 19 19:05:00 2011
@@ -648,6 +648,9 @@ public class ServiceProcessor extends Ab
}
private BindingType getBindingType(BindingInfo binding) {
+ if (binding.getExtensors(ExtensibilityElement.class) == null) {
+ return null;
+ }
for (ExtensibilityElement ext : binding.getExtensors(ExtensibilityElement.class)) {
if (SOAPBindingUtil.isSOAPBinding(ext)) {
bindingObj = SOAPBindingUtil.getSoapBinding(ext);