You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2010/10/26 15:03:52 UTC
svn commit: r1027530 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Author: asoldano
Date: Tue Oct 26 13:03:51 2010
New Revision: 1027530
URL: http://svn.apache.org/viewvc?rev=1027530&view=rev
Log:
Merged revisions 1027513 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................
r1027513 | asoldano | 2010-10-26 14:35:56 +0200 (Tue, 26 Oct 2010) | 9 lines
Merged revisions 1027509 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1027509 | asoldano | 2010-10-26 14:32:58 +0200 (Tue, 26 Oct 2010) | 2 lines
[CXF-3069] Adding NPE guard to getWrapperPartMinOccurs method
........
................
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 26 13:03:51 2010
@@ -0,0 +1,2 @@
+/cxf/branches/2.3.x-fixes:1027513
+/cxf/trunk:1027509
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1027530&r1=1027529&r2=1027530&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Tue Oct 26 13:03:51 2010
@@ -844,11 +844,13 @@ public class JaxWsServiceConfiguration e
public Long getWrapperPartMinOccurs(MessagePartInfo mpi) {
Annotation[] a = (Annotation[])mpi.getProperty(ReflectionServiceFactoryBean.PARAM_ANNOTATION);
- for (Annotation a2 : a) {
- if (a2 instanceof XmlElement) {
- XmlElement e = (XmlElement)a2;
- if (e.required()) {
- return 1L;
+ if (a != null) {
+ for (Annotation a2 : a) {
+ if (a2 instanceof XmlElement) {
+ XmlElement e = (XmlElement)a2;
+ if (e.required()) {
+ return 1L;
+ }
}
}
}