diff --git a/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java b/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java index fe5004830..352358903 100644 --- a/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java +++ b/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java @@ -1081,8 +1081,10 @@ protected final void finalize() throws Throwable { if (guard != null) { Platform.closeGuardWarnIfOpen(guard); } - synchronized (ssl) { - transitionTo(STATE_CLOSED); + if (ssl != null) { + synchronized (ssl) { + transitionTo(STATE_CLOSED); + } } } finally { super.finalize();