cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r900906 - in /cxf/branches/2.1.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Date Tue, 19 Jan 2010 18:56:02 GMT
Author: dkulp
Date: Tue Jan 19 18:56:01 2010
New Revision: 900906

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

................
  r900903 | dkulp | 2010-01-19 13:48:52 -0500 (Tue, 19 Jan 2010) | 9 lines
  
  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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java

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

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



Mime
View raw message