Add port to storage upload url (#3324)

yihanzhen · web-flow · commit d39325260d19 · 2018-05-31T12:22:05.000-07:00
diff --git a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -717,8 +717,10 @@ public String open(StorageObject object, Map<Option, ?> options) {
       GenericUrl url = req.buildHttpRequest().getUrl();
       String scheme = url.getScheme();
       String host = url.getHost();
+      int port = url.getPort();
+      port = port < 0 ? port : url.toURL().getDefaultPort();
       String path = "/upload" + url.getRawPath();
-      url = new GenericUrl(scheme + "://" + host + path);
+      url = new GenericUrl(scheme + "://" + host + ":" + port + path);
       url.set("uploadType", "resumable");
       url.set("name", object.getName());
       for (Option option : options.keySet()) {
