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 <[email protected]> Authored: Fri Nov 21 11:02:26 2014 +1100 Committer: Jason Pell <[email protected]> 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()) {
