Merge branch '1.5.x'

2017-07-06 18:38:52 -07:00
parent 6bc498cb3a aa57ca7e18
commit eb17aa06f9
24 changed files with 188 additions and 172 deletions
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
@@ -187,11 +187,11 @@ final class JarURLConnection extends java.net.JarURLConnection {

 	@Override
 	public int getContentLength() {
-		long longContentLength = getContentLengthLong();
-		if (longContentLength > Integer.MAX_VALUE) {
+		long length = getContentLengthLong();
+		if (length > Integer.MAX_VALUE) {
 			return -1;
 		}
-		return (int) longContentLength;
+		return (int) length;
 	}

 	@Override