zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Replaced TimeLimitExceededException by TimeoutException

Browse Source 
This allows the removal of the java.naming module dependency.
This commit is contained in:
Kai S. K. Engelbart
2020-04-10 21:57:05 +02:00
parent 78f14ffcb4
commit eb55e8e86b
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/envoy/client/net/Client.java
View File

@@ -6,10 +6,9 @@ import java.net.Socket;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import javax.naming.TimeLimitExceededException;
import envoy.client.data.Cache;
import envoy.client.data.ClientConfig;
import envoy.client.data.LocalDB;
@@ -61,14 +60,14 @@ public class Client implements Closeable {
* @param receivedMessageCache a message cache containing all unread messages
* from the server that can be relayed after
* initialization
* @throws TimeLimitExceededException if the server could not be reached
* @throws IOException if the login credentials could not be
* written
* @throws InterruptedException if the current thread is interrupted while
* waiting for the handshake response
* @throws TimeoutException if the server could not be reached
* @throws IOException if the login credentials could not be
* written
* @throws InterruptedException if the current thread is interrupted while
* waiting for the handshake response
*/
public void performHandshake(LoginCredentials credentials, Cache<Message> receivedMessageCache)
throws TimeLimitExceededException, IOException, InterruptedException {
throws TimeoutException, IOException, InterruptedException {
if (online) throw new IllegalStateException("Handshake has already been performed successfully");
// Establish TCP connection
logger.finer(String.format("Attempting connection to server %s:%d...", config.getServer(), config.getPort()));
@@ -103,7 +102,7 @@ public class Client implements Closeable {
return;
}
if (System.currentTimeMillis() - start > 5000) throw new TimeLimitExceededException("Did not log in after 5 seconds");
if (System.currentTimeMillis() - start > 5000) throw new TimeoutException("Did not log in after 5 seconds");
Thread.sleep(500);
}

5
src/main/java/envoy/client/ui/LoginDialog.java
View File

@@ -1,10 +1,9 @@
package envoy.client.ui;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import javax.naming.TimeLimitExceededException;
import javafx.application.Platform;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
@@ -135,7 +134,7 @@ public final class LoginDialog extends Dialog<Void> {
client.initReceiver(localDB, receivedMessageCache);
Platform.runLater(this::hide);
}
} catch (IOException | InterruptedException | TimeLimitExceededException e) {
} catch (IOException | InterruptedException | TimeoutException e) {
logger.warning("Could not connect to server. Trying offline mode...");
e.printStackTrace();
try {

1
src/main/java/module-info.java
View File

@@ -12,7 +12,6 @@ module envoy {
requires transitive envoy.common;
requires transitive java.desktop;
requires transitive java.logging;
requires transitive java.naming;
requires transitive java.prefs;
requires javafx.controls;
requires javafx.fxml;