revert partial code

Author: polyglot-k

spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java

@@ -500,9 +500,11 @@ public void updateMessageDigest(MessageDigest messageDigest) {
 		 */
 		@Override
 		public void updateMessageDigest(MessageDigest messageDigest, int len) {
-			if (this.currentBuffer == null || len == 0) {
+			if (this.currentBuffer == null) {
 				// This stream doesn't have any data in it...
 				return;
+			}else if(len == 0){
+				return;
 			}
 			else if (len < 0) {
 				throw new IllegalArgumentException("len must be 0 or greater: " + len);

spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java

@@ -119,10 +119,11 @@ public boolean containsKey(Object key) {
 			}
 			@Override
 			protected boolean removeEldestEntry(Map.Entry<String, V> eldest) {
-				if (LinkedCaseInsensitiveMap.this.removeEldestEntry(eldest)) {
+				boolean doRemove = LinkedCaseInsensitiveMap.this.removeEldestEntry(eldest);
+				if (doRemove) {
 					removeCaseInsensitiveKey(eldest.getKey());
 				}
-				return false;
+				return doRemove;
 			}
 		};
 		this.caseInsensitiveKeys = CollectionUtils.newHashMap(expectedSize);