Browse Source

Merge branch '5.1.x'

pull/22816/head
Rossen Stoyanchev 7 years ago
parent
commit
261dcab8ce
  1. 4
      spring-core/src/main/java/org/springframework/util/Base64Utils.java

4
spring-core/src/main/java/org/springframework/util/Base64Utils.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -89,7 +89,7 @@ public abstract class Base64Utils {
/** /**
* Base64-encode the given byte array to a String. * Base64-encode the given byte array to a String.
* @param src the original byte array (may be {@code null}) * @param src the original byte array
* @return the encoded byte array as a UTF-8 String * @return the encoded byte array as a UTF-8 String
*/ */
public static String encodeToString(byte[] src) { public static String encodeToString(byte[] src) {

Loading…
Cancel
Save