Polish "Fix StringSequence.equals() for different lengths"

Closes gh-15465
spring-projects · Dec 17, 2018 · c0b07a9 · c0b07a9
1 parent 2a0680c
commit c0b07a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.../spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java b/.../spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java
@@ -111,22 +111,22 @@ public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
 		}
-		if (obj == null || !CharSequence.class.isInstance(obj)) {
+		if (!(obj instanceof CharSequence)) {
 			return false;
 		}
 		CharSequence other = (CharSequence) obj;
 		int n = length();
-		if (n == other.length()) {
-			int i = 0;
-			while (n-- != 0) {
-				if (charAt(i) != other.charAt(i)) {
-					return false;
-				}
-				i++;
+		if (n != other.length()) {
+			return false;
+		}
+		int i = 0;
+		while (n-- != 0) {
+			if (charAt(i) != other.charAt(i)) {
+				return false;
 			}
-			return true;
+			i++;
 		}
-		return false;
+		return true;
 	}
 
 	@Override

diff --git a/...ng-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java b/...ng-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.