You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2015/03/26 16:28:10 UTC
cxf git commit: [CXF-6257] Creating and Endpoint using JAX-WS API,
getting the binding and then publishing causes a NullPointerException
Repository: cxf
Updated Branches:
refs/heads/master 74aea1227 -> a6598eebe
[CXF-6257] Creating and Endpoint using JAX-WS API, getting the binding and then publishing causes a NullPointerException
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6598eeb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6598eeb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6598eeb
Branch: refs/heads/master
Commit: a6598eebe4a8e737efd9ac42424e0589fda8e1c9
Parents: 74aea12
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Thu Mar 26 16:27:29 2015 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Thu Mar 26 16:28:03 2015 +0100
----------------------------------------------------------------------
core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java | 2 +-
.../jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6598eeb/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java b/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
index 5ad335f..64a0d77 100644
--- a/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
@@ -89,7 +89,7 @@ public class EndpointInfo extends AbstractDescriptionElement implements NamedIte
}
public String getAddress() {
- return (null != address) ? address.getAddress().getValue() : null;
+ return (null != address && null != address.getAddress()) ? address.getAddress().getValue() : null;
}
public void setAddress(String addr) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6598eeb/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index 467751f..793f6ba 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -338,7 +338,7 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
serv = getServer(addr);
if (addr != null) {
EndpointInfo endpointInfo = serv.getEndpoint().getEndpointInfo();
- if (!endpointInfo.getAddress().contains(addr)) {
+ if (endpointInfo.getAddress() == null || !endpointInfo.getAddress().contains(addr)) {
endpointInfo.setAddress(addr);
}
if (publishedEndpointUrl != null) {