archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8253321: java.util.Locale.LanguageRange#equals is inconsistent after calling hashCode

Browse source 
Reviewed-by: joehw, rriggs
This commit is contained in:
Naoto Sato 2020-09-21 12:33:00 +00:00
parent edc14f92d9
commit dad6edbf83
2 changed files with 51 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/java/util/Locale.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -2187,7 +2187,7 @@ public final class Locale implements Cloneable, Serializable {
/**
* Return an array of the display names of the variant.
* @param bundle the ResourceBundle to use to get the display names
* @param inLocale The locale for which to retrieve the display variant.
* @return an array of display names, possible of zero length.
*/
private String[] getDisplayVariantArray(Locale inLocale) {
@ -3335,8 +3335,7 @@ public final class Locale implements Cloneable, Serializable {
return false;
}
LanguageRange other = (LanguageRange)obj;
return hash == other.hash
&& range.equals(other.range)
return range.equals(other.range)
&& weight == other.weight;
}