Repository: camel Updated Branches: refs/heads/camel-2.15.x a9d891ae2 -> 9451290d1 refs/heads/master 78bafd794 -> 246f9ba83
CAMEL-8927: Do not swallow exception when connecting, which causes NPE exceptions later. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/246f9ba8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/246f9ba8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/246f9ba8 Branch: refs/heads/master Commit: 246f9ba8303c5f67a9632cab77443eaf04be33b8 Parents: 78bafd7 Author: Claus Ibsen <[email protected]> Authored: Thu Jul 2 11:49:17 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu Jul 2 11:49:17 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 9 +++------ .../java/org/apache/camel/component/ahc/ws/WsProducer.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/246f9ba8/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java ---------------------------------------------------------------------- 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 e0d0b88..973ca79 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 @@ -81,14 +81,10 @@ public class WsEndpoint extends AhcEndpoint { return new WsConsumer(this, processor); } - WebSocket getWebSocket() { + WebSocket getWebSocket() throws Exception { synchronized (this) { if (websocket == null) { - try { - connect(); - } catch (Exception e) { - LOG.error("Failed to connect", e); - } + connect(); } } return websocket; @@ -134,6 +130,7 @@ public class WsEndpoint extends AhcEndpoint { protected void doStop() throws Exception { if (websocket != null && websocket.isOpen()) { websocket.close(); + websocket = null; } super.doStop(); } http://git-wip-us.apache.org/repos/asf/camel/blob/246f9ba8/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java index 47a3939..d6319ad 100644 --- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java +++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java @@ -132,7 +132,7 @@ public class WsProducer extends DefaultProducer { } } - private WebSocket getWebSocket() { + private WebSocket getWebSocket() throws Exception { return getEndpoint().getWebSocket(); } }
