Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4FA6E178AC for ; Fri, 21 Nov 2014 00:03:00 +0000 (UTC) Received: (qmail 25726 invoked by uid 500); 21 Nov 2014 00:03:00 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 25668 invoked by uid 500); 21 Nov 2014 00:03:00 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 25659 invoked by uid 99); 21 Nov 2014 00:03:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Nov 2014 00:03:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BFC54947073; Fri, 21 Nov 2014 00:02:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jpell@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: added npe guard Date: Fri, 21 Nov 2014 00:02:59 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 0f941edd3 -> 751646dc9 added npe guard Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/751646dc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/751646dc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/751646dc Branch: refs/heads/3.0.x-fixes Commit: 751646dc92d05b58e563a6b000ea9ff3f86a673f Parents: 0f941ed Author: Jason Pell Authored: Fri Nov 21 11:02:26 2014 +1100 Committer: Jason Pell Committed: Fri Nov 21 11:02:26 2014 +1100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/service/model/ServiceModelUtil.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/751646dc/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java index 558aabd..d3fe66e 100644 --- a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java +++ b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java @@ -52,6 +52,9 @@ public final class ServiceModelUtil { public static BindingOperationInfo getOperation(Exchange exchange, String opName) { Endpoint ep = exchange.get(Endpoint.class); + if (ep == null) { + return null; + } BindingInfo service = ep.getEndpointInfo().getBinding(); for (BindingOperationInfo b : service.getOperations()) {