X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fcodec%2FBinaryStringCodec.java;h=172d55d7f6534534a1e012b36435f2421c1482e1;hb=b6c9d14d04e932042b49012cd303e20fc35d9609;hp=9ef16743f833605ce8bbf30618c7a8d0ddc43aba;hpb=a4fa32032aa3de9abcf4ec1a180bca2a2341a6a0;p=yangtools.git

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
index 9ef16743f8..172d55d7f6 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
@@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.annotations.Beta;
 import com.google.common.collect.RangeSet;
 import java.util.Base64;
-import javax.xml.bind.DatatypeConverter;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec;
 import org.opendaylight.yangtools.yang.data.api.codec.YangInvalidValueException;
@@ -65,13 +64,15 @@ public abstract class BinaryStringCodec extends TypeDefinitionAwareCodec<byte[],
 
     @Override
     public final byte[] deserializeImpl(final String product) {
-        final byte[] ret = DatatypeConverter.parseBase64Binary(product);
+        // https://tools.ietf.org/html/rfc4648#section-4 plus lenient to allow for MIME blocks
+        final byte[] ret = Base64.getMimeDecoder().decode(product);
         validate(ret);
         return ret;
     }
 
     @Override
     protected final String serializeImpl(final byte[] data) {
+        // We do not split data on 76 characters on output
         return Base64.getEncoder().encodeToString(data);
     }