darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2025-03-03 05:26:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8200792: PKCS12Attribute#hashCode is always constant -1

Browse Source 
Reviewed-by: xuelei
This commit is contained in:
Weijun Wang 2018-04-08 11:32:46 +08:00
parent 9fe989cc39
commit f965fb8986
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java.base/share/classes/java/security/PKCS12Attribute.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2018, 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
@ -44,7 +44,7 @@ public final class PKCS12Attribute implements KeyStore.Entry.Attribute {
Pattern.compile("^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2})+$");
private String name;
private String value;
private byte[] encoded;
private final byte[] encoded;
private int hashValue = -1;
/**
@ -199,7 +199,7 @@ public final class PKCS12Attribute implements KeyStore.Entry.Attribute {
if (!(obj instanceof PKCS12Attribute)) {
return false;
}
return Arrays.equals(encoded, ((PKCS12Attribute) obj).getEncoded());
return Arrays.equals(encoded, ((PKCS12Attribute) obj).encoded);
}
/**
@ -210,10 +210,11 @@ public final class PKCS12Attribute implements KeyStore.Entry.Attribute {
*/
@Override
public int hashCode() {
if (hashValue == -1) {
Arrays.hashCode(encoded);
int h = hashValue;
if (h == -1) {
hashValue = h = Arrays.hashCode(encoded);
}
return hashValue;
return h;
}
/**

40
test/jdk/java/security/PKCS12Attribute/HashCode.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2018, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8200792
* @summary PKCS12Attribute#hashCode is always constant -1
*/
import java.security.PKCS12Attribute;
public class HashCode {
public static void main(String[] args) throws Exception {
int h1 = new PKCS12Attribute("1.2.3.4", "AA").hashCode();
int h2 = new PKCS12Attribute("2.3.4.5", "BB,CC").hashCode();
if (h1 == -1 || h2 == -1 || h1 == h2) {
throw new Exception("I see " + h1 + " and " + h2);
}
}
}