Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 6499929df -> b831ff87e


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/b831ff87
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b831ff87
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b831ff87

Branch: refs/heads/2.7.x-fixes
Commit: b831ff87e96a6c97a565e1dea08d1cae10fa43b2
Parents: 6499929
Author: Jason Pell <[email protected]>
Authored: Fri Nov 21 10:55:30 2014 +1100
Committer: Jason Pell <[email protected]>
Committed: Fri Nov 21 10:55:30 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/b831ff87/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
----------------------------------------------------------------------
diff --git 
a/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java 
b/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
index 558aabd..d3fe66e 100644
--- a/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
+++ b/api/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()) {

Reply via email to