svn commit: r1186408 - in /cxf/branches/2.3.x-fixes: ./ common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java

[dkulp]

Author: dkulp
Date: Wed Oct 19 19:05:57 2011
New Revision: 1186408

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

................
  r1186398 | dkulp | 2011-10-19 14:52:09 -0400 (Wed, 19 Oct 2011) | 9 lines
  
  Merged revisions 1186386 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1186386 | dkulp | 2011-10-19 14:27:21 -0400 (Wed, 19 Oct 2011) | 1 line
    
    [CXF-3846] Add a NPE guard
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java

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

Modified: 
cxf/branches/2.3.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java?rev=1186408&r1=1186407&r2=1186408&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java
 Wed Oct 19 19:05:57 2011
@@ -63,13 +63,13 @@ public class WoodstoxValidationImpl impl
      * @throws XMLStreamException */
     public void setupValidation(XMLStreamReader reader, 
                                 ServiceInfo serviceInfo) throws 
XMLStreamException {
-        if (utils != null) {
+        if (utils != null && reader != null) {
             utils.setupValidation(reader, serviceInfo);
         }
     }
 
     public void setupValidation(XMLStreamWriter writer, ServiceInfo 
serviceInfo) throws XMLStreamException {
-        if (utils != null) {
+        if (utils != null && writer != null) {
             utils.setupValidation(writer, serviceInfo);
         }
     }