cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject svn commit: r1027513 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Date Tue, 26 Oct 2010 12:35:57 GMT
Author: asoldano
Date: Tue Oct 26 12:35:56 2010
New Revision: 1027513

URL: http://svn.apache.org/viewvc?rev=1027513&view=rev
Log:
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.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 12:35:56 2010
@@ -1 +1 @@
-/cxf/trunk:1027274,1027462
+/cxf/trunk:1027274,1027462,1027509

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 26 12:35:56 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1027513&r1=1027512&r2=1027513&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Tue Oct 26 12:35:56 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;
+                    }
                 }
             }
         }



Mime
View raw message