[CXF-6010] Fix potential NPE Patch from Eirik Bjorsnos applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/87567d17 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/87567d17 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/87567d17 Branch: refs/heads/2.7.x-fixes Commit: 87567d17d372bd2d6bbb1146169decc9abc38b51 Parents: 68b9435 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Oct 7 10:24:30 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Oct 7 14:03:20 2014 -0400 ---------------------------------------------------------------------- .../interceptors/MessageModeOutInterceptor.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/87567d17/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java index 9095768..6f710a7 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java @@ -202,16 +202,18 @@ public class MessageModeOutInterceptor extends AbstractPhaseInterceptor<Message> } } private void validateFaultDetail(Element detail, Schema schema, BindingOperationInfo bop) throws Exception { - Element el = DOMUtils.getFirstElement(detail); - while (el != null) { - QName qn = DOMUtils.getElementQName(el); - for (BindingFaultInfo bfi : bop.getFaults()) { - if (bfi.getFaultInfo().getMessagePartByIndex(0).getConcreteName().equals(qn)) { - //Found a fault with the correct QName, we can validate it - schema.newValidator().validate(new DOMSource(el)); + if (detail != null) { + Element el = DOMUtils.getFirstElement(detail); + while (el != null) { + QName qn = DOMUtils.getElementQName(el); + for (BindingFaultInfo bfi : bop.getFaults()) { + if (bfi.getFaultInfo().getMessagePartByIndex(0).getConcreteName().equals(qn)) { + //Found a fault with the correct QName, we can validate it + schema.newValidator().validate(new DOMSource(el)); + } } + el = DOMUtils.getNextElement(el); } - el = DOMUtils.getNextElement(el); } } private void validateFault(SoapMessage message, SOAPFault fault, BindingOperationInfo bop) {