Skip to content

Commit 52c9e8a

Browse files
authored
Merge pull request ChargeTimeEU#159 from srehlig/feature/connection_timeout
Enable ws connection timeout
2 parents ae45361 + 6a7cd1d commit 52c9e8a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

OCPP-J/src/main/java/eu/chargetime/ocpp/JSONConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class JSONConfiguration {
3636
public static final String PING_INTERVAL_PARAMETER = "PING_INTERVAL";
3737
public static final String USERNAME_PARAMETER = "USERNAME";
3838
public static final String PASSWORD_PARAMETER = "PASSWORD";
39+
public static final String CONNECT_TIMEOUT_IN_MS_PARAMETER = "CONNECT_TIMEOUT_IN_MS";
3940

4041
private final HashMap<String, Object> parameters = new HashMap<>();
4142

OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,11 @@ public void connect(String uri, RadioEvents events) {
8484
httpHeaders.put("Authorization", "Basic " + new String(base64Credentials));
8585
}
8686

87+
int connectTimeout =
88+
this.configuration.getParameter(JSONConfiguration.CONNECT_TIMEOUT_IN_MS_PARAMETER, 0);
89+
8790
client =
88-
new WebSocketClient(resource, draft, httpHeaders) {
91+
new WebSocketClient(resource, draft, httpHeaders, connectTimeout) {
8992
@Override
9093
public void onOpen(ServerHandshake serverHandshake) {
9194
logger.debug("On connection open (HTTP status: {})", serverHandshake.getHttpStatus());

0 commit comments

Comments
 (0)