cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1027279 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
Date Mon, 25 Oct 2010 21:43:33 GMT
Author: dkulp
Date: Mon Oct 25 21:43:32 2010
New Revision: 1027279

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

................
  r1027275 | dkulp | 2010-10-25 17:18:49 -0400 (Mon, 25 Oct 2010) | 9 lines
  
  Merged revisions 1027274 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1027274 | dkulp | 2010-10-25 17:17:52 -0400 (Mon, 25 Oct 2010) | 1 line
    
    Add an NPE guard to the OneWayProcessor.
  ........
................

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java

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

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java?rev=1027279&r1=1027278&r2=1027279&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
Mon Oct 25 21:43:32 2010
@@ -86,8 +86,12 @@ public class OneWayProcessorInterceptor 
                 partial.setExchange(message.getExchange());
                 Conduit conduit = message.getExchange().getDestination()
                     .getBackChannel(message, null, null);
-                conduit.prepare(partial);
-                conduit.close(partial);
+                if (conduit != null) {
+                    //for a one-way, the back channel could be
+                    //null if it knows it cannot send anything.
+                    conduit.prepare(partial);
+                    conduit.close(partial);
+                }
             } catch (IOException e) {
                 //IGNORE
             }



Mime
View raw message