From c0b07a942966acf7935cde2ed488cf010875ada6 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 17 Dec 2018 18:24:08 +0100
Subject: [PATCH] Polish "Fix StringSequence.equals() for different lengths"

Closes gh-15465
---
 .../boot/loader/jar/StringSequence.java       | 20 +++++++++----------
 .../boot/loader/jar/StringSequenceTests.java  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java
index 1e315432751..9d5b05fe25f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java
@@ -111,22 +111,22 @@ final class StringSequence implements CharSequence {
 		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/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java
index fc111c90ba8..b0097138867 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-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.