Merge pull request #1354 from wsdookadr/master

improved consistency of Base64 class name usage (using full class name)
BaseXdb · Sep 19, 2016 · e0cb08f · e0cb08f
2 parents 86a12cf + 5358b4d
commit e0cb08f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/basex-core/src/main/java/org/basex/util/http/HttpClient.java b/basex-core/src/main/java/org/basex/util/http/HttpClient.java
@@ -259,7 +259,7 @@ public static void writePayload(final OutputStream out, final HttpRequest reques
         if(base64) {
           writeHeader(CONTENT_TRANSFER_ENCODING, BASE64, out);
           out.write(CRLF);
-          contents = Base64.encode(contents);
+          contents = org.basex.util.Base64.encode(contents);
           final int bl = contents.length;
           for(int b = 0; b < bl; b += 76) {
             out.write(contents, b, Math.min(76, bl - b));

diff --git a/basex-core/src/main/java/org/basex/util/http/HttpPayload.java b/basex-core/src/main/java/org/basex/util/http/HttpPayload.java
@@ -181,7 +181,7 @@ private boolean extractPart(final byte[] sep, final byte[] end, final ANodeList
 
     byte[] payload = extractPart(sep, end, type.parameters().get(CHARSET));
     if(payloads != null) {
-      if(base64) payload = Base64.decode(payload);
+      if(base64) payload = org.basex.util.Base64.decode(payload);
       payloads.add(parse(payload, type));
     }
     return true;