From b6f8ecb58b75486e75778a40bca2383d2c381727 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 May 2020 18:58:22 +0000 Subject: [PATCH 1/3] Bump Java-WebSocket from 1.3.0 to 1.5.0 Bumps [Java-WebSocket](https://github.com/TooTallNate/Java-WebSocket) from 1.3.0 to 1.5.0. - [Release notes](https://github.com/TooTallNate/Java-WebSocket/releases) - [Changelog](https://github.com/TooTallNate/Java-WebSocket/blob/master/CHANGELOG.md) - [Commits](https://github.com/TooTallNate/Java-WebSocket/compare/Java-WebSocket-1.3.0...v1.5.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3b127a..ce8be34 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ org.java-websocket Java-WebSocket - 1.3.0 + 1.5.0 junit From fc4f69bdfef25db420157eb89a353088c9b576da Mon Sep 17 00:00:00 2001 From: Karmo Kuurberg Date: Tue, 12 May 2020 12:03:11 +0300 Subject: [PATCH 2/3] Use default draft to not depend on specific websocket version Also updated library version to 1.0.3. CDPSTUD-6491 --- pom.xml | 2 +- src/main/java/com/cdptech/cdpclient/Transport.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ce8be34..5f15d66 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.cdptech cdpclient - 1.0.2 + 1.0.3 jar ${project.groupId}:${project.artifactId} diff --git a/src/main/java/com/cdptech/cdpclient/Transport.java b/src/main/java/com/cdptech/cdpclient/Transport.java index 2b7de53..f33b72a 100644 --- a/src/main/java/com/cdptech/cdpclient/Transport.java +++ b/src/main/java/com/cdptech/cdpclient/Transport.java @@ -26,7 +26,7 @@ enum State { /** Create a transport with an URI and received data queue. */ Transport(URI serverURI, BlockingQueue queue) { - super(serverURI, new org.java_websocket.drafts.Draft_17()); + super(serverURI); this.queue = queue; this.state = State.IDLE; } From a9fa42f94242e3b2c359bc5521d9da44b302962b Mon Sep 17 00:00:00 2001 From: Karmo Kuurberg Date: Tue, 12 May 2020 12:08:49 +0300 Subject: [PATCH 3/3] Fix crash when path passed to Client.findNode does not exist In case of request error pending requests list was not cleaned. --- src/main/java/com/cdptech/cdpclient/RequestDispatch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cdptech/cdpclient/RequestDispatch.java b/src/main/java/com/cdptech/cdpclient/RequestDispatch.java index 83fab15..969c5ce 100644 --- a/src/main/java/com/cdptech/cdpclient/RequestDispatch.java +++ b/src/main/java/com/cdptech/cdpclient/RequestDispatch.java @@ -310,7 +310,7 @@ private boolean addExistingAppNode(Node receivedAppNode) { private void interceptNode(Node node) { for (Request req : new ArrayList(pendingRequests)) req.offer(node); - pendingRequests.removeIf(req -> req.getStatus() == Status.RESOLVED); + pendingRequests.removeIf(req -> req.getStatus() != Status.PENDING); } /** Find a node from this connection's cache. */