root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

This commit is contained in:
Rossen Stoyanchev 2019-04-17 12:34:22 -04:00
parent 30dbff340a 52b6f9b56d
commit 261dcab8ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {