Be more generous about incoming Base64

Notably, the python base64 encoder outputs something that maps to Java 8's MIME decoder.
Jetski5822 · Oct 11, 2016 · 10f20c7 · 10f20c7
1 parent 30f139a
commit 10f20c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/OutputType.java b/java/client/src/org/openqa/selenium/OutputType.java
@@ -52,7 +52,7 @@ public String toString() {
    */
   OutputType<byte[]> BYTES = new OutputType<byte[]>() {
     public byte[] convertFromBase64Png(String base64Png) {
-      return Base64.getDecoder().decode(base64Png);
+      return Base64.getMimeDecoder().decode(base64Png);
     }
 
     public byte[] convertFromPngBytes(byte[] png) {

diff --git a/java/client/src/org/openqa/selenium/io/Zip.java b/java/client/src/org/openqa/selenium/io/Zip.java
@@ -117,7 +117,7 @@ private void addToZip(String basePath, ZipOutputStream zos, File toAdd) throws I
   }
 
   public void unzip(String source, File outputDir) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(source);
+    byte[] bytes = Base64.getMimeDecoder().decode(source);
 
     ByteArrayInputStream bis = null;
     try {