From 7af92b483a89bd7e7cea38f57176fff6c8fbd11c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 11 Dec 2012 15:50:24 +0100 Subject: [PATCH] Fixed HierarchicalUriComponents equals implementation Issue: SPR-10088 --- .../web/util/HierarchicalUriComponents.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java index c1476d053b..f3a5ec9013 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java @@ -38,7 +38,7 @@ import org.springframework.util.StringUtils; * Extension of {@link UriComponents} for hierarchical URIs. * * @author Arjen Poutsma - * @since 3.2 + * @since 3.1.3 * @see Hierarchical URIs */ final class HierarchicalUriComponents extends UriComponents { @@ -421,12 +421,10 @@ final class HierarchicalUriComponents extends UriComponents { if (this == obj) { return true; } - if (!(obj instanceof OpaqueUriComponents)) { + if (!(obj instanceof HierarchicalUriComponents)) { return false; } - HierarchicalUriComponents other = (HierarchicalUriComponents) obj; - if (ObjectUtils.nullSafeEquals(getScheme(), other.getScheme())) { return false; } @@ -448,7 +446,6 @@ final class HierarchicalUriComponents extends UriComponents { if (ObjectUtils.nullSafeEquals(getFragment(), other.getFragment())) { return false; } - return true; }