Skip to content
Permalink
Browse files
8251548: Remove unnecessary explicit initialization of volatile varia…
…bles in security-libs code

Reviewed-by: mullan
  • Loading branch information
stsypanov authored and wangweij committed Sep 18, 2020
1 parent d35b117 commit f55dd9d40ed4dc03d96c06cd283c9aae814daec4
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
@@ -219,7 +219,7 @@ public class KeyStore {
private KeyStoreSpi keyStoreSpi;

// Has this keystore been initialized (loaded)?
private boolean initialized = false;
private boolean initialized;

/**
* A marker interface for {@code KeyStore}
@@ -264,7 +264,7 @@ public static class PasswordProtection implements
private final char[] password;
private final String protectionAlgorithm;
private final AlgorithmParameterSpec protectionParameters;
private volatile boolean destroyed = false;
private volatile boolean destroyed;

/**
* Creates a password parameter.
@@ -206,5 +206,5 @@ private synchronized void loadLookup() {
lookup = temp;
}

private volatile Map<String,Object> lookup = null;
private volatile Map<String,Object> lookup;
}
@@ -126,7 +126,7 @@ public final class Subject implements java.io.Serializable {
*
* @serial
*/
private volatile boolean readOnly = false;
private volatile boolean readOnly;

private static final int PRINCIPAL_SET = 1;
private static final int PUB_CREDENTIAL_SET = 2;
@@ -71,7 +71,7 @@ public abstract class AbstractDrbg {

// Common working status

private boolean instantiated = false;
private boolean instantiated;

/**
* Reseed counter of a DRBG instance. A mechanism should increment it
@@ -80,7 +80,7 @@ public abstract class AbstractDrbg {
*
* Volatile, will be used in a double checked locking.
*/
protected volatile int reseedCounter = 0;
protected volatile int reseedCounter;

// Mech features. If not same as below, must be redefined in constructor.

@@ -36,15 +36,15 @@
*/
final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {

private DTLSFragmenter fragmenter = null;
private DTLSFragmenter fragmenter;

int writeEpoch;

int prevWriteEpoch;
Authenticator prevWriteAuthenticator;
SSLWriteCipher prevWriteCipher;

private volatile boolean isCloseWaiting = false;
private volatile boolean isCloseWaiting;

DTLSOutputRecord(HandshakeHash handshakeHash) {
super(handshakeHash, SSLWriteCipher.nullDTlsWriteCipher());
@@ -102,11 +102,11 @@ abstract class HandshakeContext implements ConnectionContext {
boolean isResumption;
SSLSessionImpl resumingSession;
// Session is using stateless resumption
boolean statelessResumption = false;
boolean statelessResumption;

final Queue<Map.Entry<Byte, ByteBuffer>> delegatedActions;
volatile boolean taskDelegated = false;
volatile Exception delegatedThrown = null;
volatile boolean taskDelegated;
volatile Exception delegatedThrown;

ProtocolVersion negotiatedProtocol;
CipherSuite negotiatedCipherSuite;
@@ -37,11 +37,11 @@
*/
final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {

private HandshakeFragment fragmenter = null;
private boolean isTalkingToV2 = false; // SSLv2Hello
private ByteBuffer v2ClientHello = null; // SSLv2Hello
private HandshakeFragment fragmenter;
private boolean isTalkingToV2; // SSLv2Hello
private ByteBuffer v2ClientHello; // SSLv2Hello

private volatile boolean isCloseWaiting = false;
private volatile boolean isCloseWaiting;

SSLEngineOutputRecord(HandshakeHash handshakeHash) {
super(handshakeHash, SSLWriteCipher.nullTlsWriteCipher());
@@ -83,8 +83,8 @@

private String peerHost;
private boolean autoClose;
private boolean isConnected = false;
private volatile boolean tlsIsClosed = false;
private boolean isConnected;
private volatile boolean tlsIsClosed;

private final ReentrantLock socketLock = new ReentrantLock();
private final ReentrantLock handshakeLock = new ReentrantLock();

1 comment on commit f55dd9d

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented on f55dd9d Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.