Fix failing tests by correcting OkHttpClient

odedniv · Jan 18, 2018 · 834478e · 834478e
1 parent 395c7db
commit 834478e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/java/client/src/org/openqa/selenium/remote/internal/OkHttpClient.java b/java/client/src/org/openqa/selenium/remote/internal/OkHttpClient.java
@@ -57,7 +57,8 @@ public HttpResponse execute(HttpRequest request, boolean followRedirects) throws
 
     HttpUrl.Builder url;
     try {
-      url = HttpUrl.parse(baseUrl.toString() + request.getUri()).newBuilder();
+      String rawUrl = baseUrl.toExternalForm().replaceAll("/$", "") + request.getUri();
+      url = HttpUrl.parse(rawUrl).newBuilder();
     } catch (NullPointerException e) {
       throw new IOException("Unable to parse URL: " + baseUrl.toString() + request.getUri());
     }