Repository: jclouds Updated Branches: refs/heads/master c6c1b1a65 -> 5641efa0c
JCLOUDS-534 Folded overly explicit use of HostAndPort, which is also incompatible with guava 16. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8d0c7f9a Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8d0c7f9a Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8d0c7f9a Branch: refs/heads/master Commit: 8d0c7f9a6cb9b85c25003bc4fd25ce9f8d4f859e Parents: 0012e6f Author: Adrian Cole <[email protected]> Authored: Mon Oct 27 08:48:27 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Wed Oct 29 17:01:26 2014 -0700 ---------------------------------------------------------------------- .../blobstore/integration/internal/BaseContainerLiveTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/8d0c7f9a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java index b2f7d68..f810527 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java @@ -76,7 +76,7 @@ public class BaseContainerLiveTest extends BaseBlobStoreIntegrationTest { SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class); Predicate<HostAndPort> socketTester = retry(socketOpen, 1200, 10, SECONDS); - assertTrue(socketTester.apply(HostAndPort.fromHost(metadata.getPublicUri().getHost()).withDefaultPort(80)), metadata.getPublicUri().toString()); + assertTrue(socketTester.apply(HostAndPort.fromParts(metadata.getPublicUri().getHost(), 80)), metadata.getPublicUri().toString()); assertEquals(Strings2.toStringAndClose(view.utils().http().get(metadata.getPublicUri())), TEST_STRING);
