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

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
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;
}
/**