Skip to content

Fix TCP socket finishConnect() exception handling and connection logic #3783

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

Open
wants to merge 1 commit into
base: master-MC1.7.10
Choose a base branch
from
Open

Fix TCP socket finishConnect() exception handling and connection logic #3783

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
9 changes: 6 additions & 3 deletions src/main/scala/li/cil/oc/server/component/InternetCard.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ object InternetCard {
private def checkConnected() = {
if (owner.isEmpty) throw new IOException("connection lost")
try {
if (isAddressResolved) channel.finishConnect()
if (isAddressResolved) {
channel.finishConnect()
}
else if (address.isCancelled) {
// I don't think this can ever happen, Justin Case.
channel.close()
Expand All @@ -341,14 +343,15 @@ object InternetCard {
case e: ExecutionException => throw e.getCause
}
isAddressResolved = true
false
// After address resolution, immediately attempt connection
channel.finishConnect()
}
else false
}
catch {
case t: Throwable =>
close()
false
throw t // Propagate exception instead of returning false
}
}

Expand Down