Skip to content

added a timeout option for connectBlocking #724

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

Merged
PhilipRoman merged 2 commits into from
Jun 27, 2018
Merged

added a timeout option for connectBlocking #724

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff6665e
added a timeout option for connectBlocking
cymp Jun 26, 2018
7961e87
formatted
cymp Jun 26, 2018
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
15 changes: 15 additions & 0 deletions src/main/java/org/java_websocket/client/WebSocketClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
Expand Down Expand Up @@ -281,6 +282,20 @@ public boolean connectBlocking() throws InterruptedException {
return engine.isOpen();
}

/**
* Same as <code>connect</code> but blocks with a timeout until the websocket connected or failed to do so.<br>
* @param timeout
* The connect timeout
* @param timeUnit
* The timeout time unit
* @return Returns whether it succeeded or not.
* @throws InterruptedException Thrown when the threads get interrupted
*/
public boolean connectBlocking(long timeout, TimeUnit timeUnit) throws InterruptedException {
connect();
return connectLatch.await(timeout, timeUnit) && engine.isOpen();
}

/**
* Initiates the websocket close handshake. This method does not block<br>
* In oder to make sure the connection is closed use <code>closeBlocking</code>
Expand Down