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

Merge pull request #3314 from izeye/patch-24 

* pr/3314:
  Use `bytes.length` in Base64Encoder loop
This commit is contained in:
Phillip Webb 2015-06-24 21:08:24 -07:00
parent 855e5a8e5f 286c98d716
commit 689fb0c877
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Base64Encoder.java
View File

@ -40,7 +40,7 @@ class Base64Encoder {
public static String encode(byte[] bytes) { public static String encode(byte[] bytes) {
byte[] encoded = new byte[bytes.length / 3 * 4 + (bytes.length % 3 == 0 ? 0 : 4)]; byte[] encoded = new byte[bytes.length / 3 * 4 + (bytes.length % 3 == 0 ? 0 : 4)];
for (int i = 0; i < encoded.length; i += 3) { for (int i = 0; i < bytes.length; i += 3) {
encodeBlock(bytes, i, Math.min((bytes.length - i), 3), encoded, i / 3 * 4); encodeBlock(bytes, i, Math.min((bytes.length - i), 3), encoded, i / 3 * 4);
} }
return new String(encoded, UTF_8); return new String(encoded, UTF_8);
@ -48,14 +48,12 @@ class Base64Encoder {
private static void encodeBlock(byte[] src, int srcPos, int blockLen, byte[] dest, private static void encodeBlock(byte[] src, int srcPos, int blockLen, byte[] dest,
int destPos) { int destPos) {
if (blockLen > 0) { int inBuff = (blockLen > 0 ? ((src[srcPos] << 24) >>> 8) : 0)
int inBuff = (blockLen > 0 ? ((src[srcPos] << 24) >>> 8) : 0) | (blockLen > 1 ? ((src[srcPos + 1] << 24) >>> 16) : 0)
| (blockLen > 1 ? ((src[srcPos + 1] << 24) >>> 16) : 0) | (blockLen > 2 ? ((src[srcPos + 2] << 24) >>> 24) : 0);
| (blockLen > 2 ? ((src[srcPos + 2] << 24) >>> 24) : 0); for (int i = 0; i < 4; i++) {
for (int i = 0; i < 4; i++) { dest[destPos + i] = (i > blockLen ? EQUALS_SIGN
dest[destPos + i] = (i > blockLen ? EQUALS_SIGN : ALPHABET[(inBuff >>> (6 * (3 - i))) & 0x3f]);
: ALPHABET[(inBuff >>> (6 * (3 - i))) & 0x3f]);
}
} }
} }

16
spring-boot/src/main/java/org/springframework/boot/test/Base64Encoder.java
View File

@ -40,7 +40,7 @@ class Base64Encoder {
public static String encode(byte[] bytes) { public static String encode(byte[] bytes) {
byte[] encoded = new byte[bytes.length / 3 * 4 + (bytes.length % 3 == 0 ? 0 : 4)]; byte[] encoded = new byte[bytes.length / 3 * 4 + (bytes.length % 3 == 0 ? 0 : 4)];
for (int i = 0; i < encoded.length; i += 3) { for (int i = 0; i < bytes.length; i += 3) {
encodeBlock(bytes, i, Math.min((bytes.length - i), 3), encoded, i / 3 * 4); encodeBlock(bytes, i, Math.min((bytes.length - i), 3), encoded, i / 3 * 4);
} }
return new String(encoded, UTF_8); return new String(encoded, UTF_8);
@ -48,14 +48,12 @@ class Base64Encoder {
private static void encodeBlock(byte[] src, int srcPos, int blockLen, byte[] dest, private static void encodeBlock(byte[] src, int srcPos, int blockLen, byte[] dest,
int destPos) { int destPos) {
if (blockLen > 0) { int inBuff = (blockLen > 0 ? ((src[srcPos] << 24) >>> 8) : 0)
int inBuff = (blockLen > 0 ? ((src[srcPos] << 24) >>> 8) : 0) | (blockLen > 1 ? ((src[srcPos + 1] << 24) >>> 16) : 0)
| (blockLen > 1 ? ((src[srcPos + 1] << 24) >>> 16) : 0) | (blockLen > 2 ? ((src[srcPos + 2] << 24) >>> 24) : 0);
| (blockLen > 2 ? ((src[srcPos + 2] << 24) >>> 24) : 0); for (int i = 0; i < 4; i++) {
for (int i = 0; i < 4; i++) { dest[destPos + i] = (i > blockLen ? EQUALS_SIGN
dest[destPos + i] = (i > blockLen ? EQUALS_SIGN : ALPHABET[(inBuff >>> (6 * (3 - i))) & 0x3f]);
: ALPHABET[(inBuff >>> (6 * (3 - i))) & 0x3f]);
}
} }
} }