Author: dkulp
Date: Tue Feb 5 19:55:37 2008
New Revision: 618872
URL: http://svn.apache.org/viewvc?rev=618872&view=rev
Log:
Merged revisions 618767 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r618767 | dkulp | 2008-02-05 15:19:10 -0500 (Tue, 05 Feb 2008) | 2 lines
Fix possible NPE in FaultOutInterceptor
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=618872&r1=618871&r2=618872&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
Tue Feb 5 19:55:37 2008
@@ -58,6 +58,9 @@
}
BindingOperationInfo bop =
message.getExchange().get(BindingOperationInfo.class);
+ if (bop == null) {
+ return;
+ }
FaultInfo fi = getFaultForClass(bop, cause.getClass());
if (cause instanceof Exception && fi != null) {
