cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject [2/6] cxf git commit: [CXF-6404][CXF-6415] fix bug
Date Wed, 20 May 2015 07:53:37 GMT
[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/0eaa88b5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0eaa88b5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0eaa88b5

Branch: refs/heads/3.0.x-fixes
Commit: 0eaa88b5b1e580b660f861412d692e97cc93bdea
Parents: 997b4e1
Author: Alessio Soldano <asoldano@redhat.com>
Authored: Wed May 20 00:13:30 2015 +0200
Committer: Alessio Soldano <asoldano@redhat.com>
Committed: Wed May 20 09:48:38 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/0eaa88b5/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 b77a614..737221b 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());
                 }
             }
         }


Mime
View raw message