brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/2] brooklyn-server git commit: Fix https tests
Date Tue, 29 Nov 2016 17:32:44 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 56496fa54 -> 23f9a715c


Fix https tests


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/81a25ea9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/81a25ea9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/81a25ea9

Branch: refs/heads/master
Commit: 81a25ea9aa91199e9ed10b4e7b395fd177736fd1
Parents: 56496fa
Author: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Authored: Tue Nov 29 16:58:51 2016 +0000
Committer: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Committed: Tue Nov 29 16:58:51 2016 +0000

----------------------------------------------------------------------
 .../org/apache/brooklyn/test/framework/TestHttpCallImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/81a25ea9/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java
----------------------------------------------------------------------
diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java
b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java
index a825c8e..87abe90 100644
--- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java
+++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java
@@ -93,7 +93,7 @@ public class TestHttpCallImpl extends TargetableTestComponentImpl implements
Tes
                     public String get() {
                         try {
                             final HttpRequestBase httpMethod = createHttpMethod(method, url,
headers, body);
-                            return HttpTool.execAndConsume(HttpTool.httpClientBuilder().trustAll(trustAll).build(),
httpMethod).getContentAsString();
+                            return HttpTool.execAndConsume(HttpTool.httpClientBuilder().uri(url).trustAll(trustAll).build(),
httpMethod).getContentAsString();
                         } catch (Exception e) {
                             LOG.info("HTTP call to [{}] failed due to [{}]", url, e.getMessage());
                             throw Exceptions.propagate(e);
@@ -109,7 +109,7 @@ public class TestHttpCallImpl extends TargetableTestComponentImpl implements
Tes
                     public Integer get() {
                         try {
                             final HttpRequestBase httpMethod = createHttpMethod(method, url,
headers, body);
-                            final Maybe<HttpResponse> response = HttpTool.execAndConsume(HttpTool.httpClientBuilder().trustAll(trustAll).build(),
httpMethod).getResponse();
+                            final Maybe<HttpResponse> response = HttpTool.execAndConsume(HttpTool.httpClientBuilder().uri(url).trustAll(trustAll).build(),
httpMethod).getResponse();
                             if (response.isPresentAndNonNull()) {
                                 return response.get().getStatusLine().getStatusCode();
                             } else {


Mime
View raw message