Skip to content

Fix AsynchronousTlsChannelGroup closing #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix AsynchronousTlsChannelGroup closing #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public boolean supportsAdditionalTimeout() {

@Override
public boolean supportsConcurrentClose() {
return false;
return true;
}

@Override
Expand Down
11 changes: 10 additions & 1 deletion ...rc/main/com/mongodb/internal/connection/tlschannel/async/AsynchronousTlsChannelGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.mongodb.internal.connection.tlschannel.util.Util;

import java.io.IOException;
import java.nio.channels.AsynchronousCloseException;
import java.nio.channels.CancelledKeyException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.InterruptedByTimeoutException;
Expand Down Expand Up @@ -121,7 +122,9 @@ class RegisteredSocket {
public void close() {
doCancelRead(this, null);
doCancelWrite(this, null);
key.cancel();
if (key != null) {
key.cancel();
}
currentRegistrations.getAndDecrement();
/*
* Actual de-registration from the selector will happen asynchronously.
Expand Down Expand Up @@ -263,6 +266,9 @@ boolean doCancelRead(final RegisteredSocket socket, final ReadOperation op) {
try {
// a null op means cancel any operation
if (op != null && socket.readOperation == op || op == null && socket.readOperation != null) {
if (op == null) {
socket.readOperation.onFailure.accept(new AsynchronousCloseException());
}
socket.readOperation = null;
cancelledReads.increment();
currentReads.decrement();
Expand All @@ -280,6 +286,9 @@ boolean doCancelWrite(final RegisteredSocket socket, final WriteOperation op) {
try {
// a null op means cancel any operation
if (op != null && socket.writeOperation == op || op == null && socket.writeOperation != null) {
if (op == null) {
socket.writeOperation.onFailure.accept(new AsynchronousCloseException());
}
socket.writeOperation = null;
cancelledWrites.increment();
currentWrites.decrement();
Expand Down