Repository: camel Updated Branches: refs/heads/master 5c6fd5258 -> f43c5359c
[CAMEL-9398] NullPointerException when connectionKey is not valid Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f43c5359 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f43c5359 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f43c5359 Branch: refs/heads/master Commit: f43c5359c64992c7f2dc011e38bb799f7a2a7f69 Parents: 5c6fd52 Author: Pavlo Kletsko <[email protected]> Authored: Mon Dec 7 10:49:08 2015 +0100 Committer: Pavlo Kletsko <[email protected]> Committed: Mon Dec 7 10:49:08 2015 +0100 ---------------------------------------------------------------------- .../atmosphere/websocket/WebsocketProducer.java | 32 +++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f43c5359/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java index 9501537..70a6c0f 100644 --- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java +++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java @@ -112,23 +112,25 @@ public class WebsocketProducer extends DefaultProducer { } private void sendMessage(final WebSocket websocket, final Object message) { - executor.execute(new Runnable() { - @Override - public void run() { - try { - if (message instanceof String) { - websocket.write((String) message); - } else if (message instanceof byte[]) { - websocket.write((byte[]) message, 0, ((byte[]) message).length); - } else { - // this should not happen unless one of the supported types is missing above. - LOG.error("unexpected message type {}", message == null ? null : message.getClass()); + if (websocket != null && message != null) { + executor.execute(new Runnable() { + @Override + public void run() { + try { + if (message instanceof String) { + websocket.write((String) message); + } else if (message instanceof byte[]) { + websocket.write((byte[]) message, 0, ((byte[]) message).length); + } else { + // this should not happen unless one of the supported types is missing above. + LOG.error("unexpected message type {}", message == null ? null : message.getClass()); + } + } catch (Exception e) { + LOG.error("Error when writing to websocket", e); } - } catch (Exception e) { - LOG.error("Error when writing to websocket", e); } - } - }); + }); + } } private WebSocket getWebSocket(final String connectionKey) {
