Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1245608 - in /cxf/branches/2.3.x-fixes: ./
 rt/core/src/main/java/org/apache/cxf/interceptor/
 rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/
Date: Fri, 17 Feb 2012 15:26:29 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20120217152629.ABB3B238897D@eris.apache.org>

Author: dkulp
Date: Fri Feb 17 15:26:29 2012
New Revision: 1245608

URL: http://svn.apache.org/viewvc?rev=1245608&view=rev
Log:
Merged revisions 1239401 via  svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1239401 | ay | 2012-02-01 18:33:42 -0500 (Wed, 01 Feb 2012) | 19 lines
  
  Merged revisions 1239381,1239385 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1239381 | ay | 2012-02-01 23:43:12 +0100 (Wed, 01 Feb 2012) | 8 lines
    
    Blocked revisions 1239373 via svnmerge
    
    ........
      r1239373 | ay | 2012-02-01 23:29:19 +0100 (Wed, 01 Feb 2012) | 1 line
      
      [CXF-4072] avoid NPE when a fault has no part
    ........
  ................
    r1239385 | ay | 2012-02-01 23:53:37 +0100 (Wed, 01 Feb 2012) | 1 line
    
    [CXF-4072] avoid NPE when a fault has no part
  ................
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
    cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties

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

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=1245608&r1=1245607&r2=1245608&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java Fri Feb 17 15:26:29 2012
@@ -160,7 +160,7 @@ public class FaultOutInterceptor extends
 
             FaultInfo faultInfo = bfi.getFaultInfo();
             Class<?> c = (Class)faultInfo.getProperty(Class.class.getName());
-            if (c.isAssignableFrom(class1)) {
+            if (c != null && c.isAssignableFrom(class1)) {
                 return faultInfo;
             }
         }

Modified: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1245608&r1=1245607&r2=1245608&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Fri Feb 17 15:26:29 2012
@@ -856,7 +856,12 @@ public class ReflectionServiceFactoryBea
             QName name = getFaultName(o.getInterface(), o, exClass, beanClass);
 
             for (FaultInfo fi : o.getFaults()) {
-                for (MessagePartInfo mpi : fi.getMessageParts()) {
+                List<MessagePartInfo> mpis = fi.getMessageParts();
+                if (mpis.size() != 1) {
+                    Message message = new Message("NO_FAULT_PART", LOG, fi.getFaultName()); 
+                    LOG.log(Level.WARNING, message.toString());
+                }
+                for (MessagePartInfo mpi : mpis) {
                     String ns = null;
                     if (mpi.isElement()) {
                         ns = mpi.getElementQName().getNamespaceURI();

Modified: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties?rev=1245608&r1=1245607&r2=1245608&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties Fri Feb 17 15:26:29 2012
@@ -33,4 +33,6 @@ INTRACTABLE_PART= Message part {0} of Me
 JAXWS_ANNOTATION_FOUND=A JAX-WS Annotation was found on {0} while using the Simple frontend.  For better results, use the JAX-WS frontend.
 XSD_VALIDATION_ERROR= Error in W3C XML Schema associated with service: {0}
 COULD_NOT_UNWRAP=Could not unwrap Operation {0} to match method "{1}"
+NO_WSDL_PROVIDED=WSDL is required for services created from class {0}, but no WSDL location specified. 
+NO_FAULT_PART = Could not find a fault part for {0}. The fault message must have a single part.