You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2015/05/20 00:14:17 UTC
cxf git commit: [CXF-6404][CXF-6415] fix bug
Repository: cxf
Updated Branches:
refs/heads/master dd1b3ebf5 -> 79f9a1056
[CXF-6404][CXF-6415] fix bug
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79f9a105
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79f9a105
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79f9a105
Branch: refs/heads/master
Commit: 79f9a1056d979b138041ef0693052d3f989ef522
Parents: dd1b3eb
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed May 20 00:13:30 2015 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed May 20 00:13:30 2015 +0200
----------------------------------------------------------------------
.../org/apache/cxf/transport/http/HTTPConduit.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/79f9a105/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 20c4aa2..96f0377 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -727,13 +727,14 @@ public abstract class HTTPConduit
if (defaultAddress == null) {
if (fromEndpointReferenceType && getTarget().getAddress().getValue() != null) {
defaultAddress = new Address(this.getTarget().getAddress().getValue());
+ } else {
+ if (endpointInfo.getAddress() == null) {
+ throw new URISyntaxException("<null>",
+ "Invalid address. Endpoint address cannot be null.",
+ 0);
+ }
+ defaultAddress = new Address(endpointInfo.getAddress());
}
- if (endpointInfo.getAddress() == null) {
- throw new URISyntaxException("<null>",
- "Invalid address. Endpoint address cannot be null.",
- 0);
- }
- defaultAddress = new Address(endpointInfo.getAddress());
}
}
}