Author: dkulp
Date: Mon May 19 12:25:00 2008
New Revision: 657928
URL: http://svn.apache.org/viewvc?rev=657928&view=rev
Log:
Merged revisions 657922 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r657922 | dkulp | 2008-05-19 15:08:11 -0400 (Mon, 19 May 2008) | 2 lines
Add a guard NPE check
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=657928&r1=657927&r2=657928&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++
cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Mon May 19 12:25:00 2008
@@ -337,10 +337,12 @@
Mapping mapping = rawJaxbModelGenCode.get(wrapperElement);
if (mapping != null) {
List<? extends Property> propList =
mapping.getWrapperStyleDrilldown();
- for (Property pro : propList) {
- if
(pro.elementName().getNamespaceURI().equals(item.getNamespaceURI())
- &&
pro.elementName().getLocalPart().equals(item.getLocalPart())) {
- return pro.type().fullName();
+ if (propList != null) {
+ for (Property pro : propList) {
+ if
(pro.elementName().getNamespaceURI().equals(item.getNamespaceURI())
+ &&
pro.elementName().getLocalPart().equals(item.getLocalPart())) {
+ return pro.type().fullName();
+ }
}
}
}
