Skip to content

Commit

Permalink
8290005: com/sun/jndi/ldap/LdapCBPropertiesTest.java failling with Nu…
Browse files Browse the repository at this point in the history
…llPointerException

Reviewed-by: jnimeh, xuelei
  • Loading branch information
Matthew Donovan committed Jul 17, 2023
1 parent acf591e commit afcf8e4
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,10 @@ private void duplexCloseOutput() throws IOException {
// Use user_canceled alert regardless the protocol versions.
useUserCanceled = true;

// The protocol version may have been negotiated.
ProtocolVersion pv = conContext.handshakeContext.negotiatedProtocol;
// The protocol version may have been negotiated. The
// conContext.handshakeContext.negotiatedProtocol is not used as there
// may be a race to set it to null.
ProtocolVersion pv = conContext.protocolVersion;
if (pv == null || (!pv.useTLS13PlusSpec())) {
hasCloseReceipt = true;
}
Expand Down Expand Up @@ -1386,7 +1388,6 @@ public String getHandshakeApplicationProtocol() {
} finally {
socketLock.unlock();
}

return null;
}

Expand Down

1 comment on commit afcf8e4

@openjdk-notifier
Copy link

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.