You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/01/19 19:48:53 UTC

svn commit: r900903 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java

Author: dkulp
Date: Tue Jan 19 18:48:52 2010
New Revision: 900903

URL: http://svn.apache.org/viewvc?rev=900903&view=rev
Log:
Merged revisions 900899 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r900899 | dkulp | 2010-01-19 13:45:46 -0500 (Tue, 19 Jan 2010) | 1 line
  
  NPE guard
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java

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

Modified: cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=900903&r1=900902&r2=900903&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Tue Jan 19 18:48:52 2010
@@ -473,6 +473,9 @@
      * @param outMessage
      */
     private void cacheInput(Message outMessage) {
+        if (outMessage.getExchange() == null) {
+            return;
+        }
         Message inMessage = outMessage.getExchange().getInMessage();
         if (inMessage == null) {
             return;