You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/11/27 10:14:57 UTC
[camel] branch master updated (fa2ab61 -> a701c6d)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from fa2ab61 Regen
new 6e7beee CAMEL-12952 Send pong frame as a response to ping frame
new 11f6dd1 CAMEL-12951 reconnect exception is passed to exception handler
new a701c6d Camel-AHC WS - Fixed CS
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 9 +++++++++
1 file changed, 9 insertions(+)
[camel] 01/03: CAMEL-12952 Send pong frame as a response to ping
frame
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6e7beee8e596fa601e756d415404e19bf7eb5d9f
Author: Jukka Aalto <ju...@insta.fi>
AuthorDate: Mon Nov 26 13:52:10 2018 +0200
CAMEL-12952 Send pong frame as a response to ping frame
---
.../src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 9ce71a2..b3d2a42 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -201,6 +201,10 @@ public class WsEndpoint extends AhcEndpoint {
}
}
+ public void onPingFrame(byte[] payload) {
+ LOG.debug("Received ping --> {}", payload);
+ websocket.sendPongFrame(payload);
+ }
}
}
[camel] 03/03: Camel-AHC WS - Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a701c6d2070573074c8a8931fba8da9f21a9fa55
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 27 11:14:29 2018 +0100
Camel-AHC WS - Fixed CS
---
.../src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index edc7d76..a5f24a2 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -174,7 +174,7 @@ public class WsEndpoint extends AhcEndpoint {
} catch (Exception e) {
LOG.warn("Error re-connecting to websocket", e);
ExceptionHandler exceptionHandler = getExceptionHandler();
- if(exceptionHandler != null) {
+ if (exceptionHandler != null) {
exceptionHandler.handleException("Error re-connecting to websocket", e);
}
}
[camel] 02/03: CAMEL-12951 reconnect exception is passed to
exception handler
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 11f6dd1a56e80fc3038c2d287415b7105e573403
Author: Jukka Aalto <ju...@insta.fi>
AuthorDate: Mon Nov 26 13:54:52 2018 +0200
CAMEL-12951 reconnect exception is passed to exception handler
---
.../src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index b3d2a42..edc7d76 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -23,6 +23,7 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ahc.AhcEndpoint;
+import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.asynchttpclient.AsyncHttpClient;
@@ -172,6 +173,10 @@ public class WsEndpoint extends AhcEndpoint {
reConnect();
} catch (Exception e) {
LOG.warn("Error re-connecting to websocket", e);
+ ExceptionHandler exceptionHandler = getExceptionHandler();
+ if(exceptionHandler != null) {
+ exceptionHandler.handleException("Error re-connecting to websocket", e);
+ }
}
}