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/10/25 23:18:49 UTC
svn commit: r1027275 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
Author: dkulp
Date: Mon Oct 25 21:18:49 2010
New Revision: 1027275
URL: http://svn.apache.org/viewvc?rev=1027275&view=rev
Log:
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1027274
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 25 21:18:49 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java?rev=1027275&r1=1027274&r2=1027275&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java Mon Oct 25 21:18:49 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
}