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:58:47 UTC
[camel] branch master updated (3b1e54a -> 562ab25)
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.
discard 3b1e54a Merge branch 'master' of https://gitbox.apache.org/repos/asf/camel
discard b3771fd Merge branch 'master' of https://gitbox.apache.org/repos/asf/camel
omit 89d4b50 CAMEL-12958 - Wrong camel context bound in service registry of jbpm/Kie Server
omit a701c6d Camel-AHC WS - Fixed CS
omit 11f6dd1 CAMEL-12951 reconnect exception is passed to exception handler
omit 6e7beee CAMEL-12952 Send pong frame as a response to ping frame
new 45f10a2 CAMEL-12952 Send pong frame as a response to ping frame
new 39e1076 CAMEL-12951 reconnect exception is passed to exception handler
new ba022b4 Camel-AHC WS - Fixed CS
new 562ab25 CAMEL-12958 - Wrong camel context bound in service registry of jbpm/Kie Server
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3b1e54a)
\
N -- N -- N refs/heads/master (562ab25)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 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:
[camel] 03/04: 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 ba022b4ce8be405d57d209055f830750b9042b01
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] 04/04: CAMEL-12958 - Wrong camel context bound in service
registry of jbpm/Kie Server
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 562ab251ca5ad6e9661506ffaebdfeb1e88d03b2
Author: Maciej Swiderski <sw...@gmail.com>
AuthorDate: Mon Nov 26 13:42:48 2018 +0100
CAMEL-12958 - Wrong camel context bound in service registry of jbpm/Kie Server
---
.../org/apache/camel/component/jbpm/server/CamelKieServerExtension.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
index fbc4448..0e297be 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -117,7 +117,7 @@ public class CamelKieServerExtension implements KieServerExtension {
context.start();
camelContexts.put(id, context);
- ServiceRegistry.get().register(id + "_CamelService", this.camel);
+ ServiceRegistry.get().register(id + "_CamelService", context);
}
} catch (Exception e) {
[camel] 02/04: 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 39e10760e8c100d088f49a69e50ecea3be1e7207
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);
+ }
}
}
[camel] 01/04: 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 45f10a292204445faa14b3750b6ca7d8b112fa8c
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);
+ }
}
}