From 4358c4e64c6d2dd9be306d0cfda0091165e85720 Mon Sep 17 00:00:00 2001 From: "selva.andre" Date: Fri, 23 May 2014 00:03:22 +0200 Subject: [PATCH] Minor, added WebSocket port check to enable WebSocket binding --- .../dna/mqtt/moquette/server/netty/NettyAcceptor.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyAcceptor.java index 6abe4dc8..e6c0d273 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyAcceptor.java @@ -124,6 +124,14 @@ public class NettyAcceptor implements ServerAcceptor { } private void initializeWebSocketTransport(IMessaging messaging, Properties props) throws IOException { + String webSocketPortProp = props.getProperty("websocket_port"); + if (webSocketPortProp == null) { + //Do nothing no WebSocket configured + LOG.info("WebSocket is disabled"); + return; + } + int port = Integer.parseInt(webSocketPortProp); + final NettyMQTTHandler handler = new NettyMQTTHandler(); handler.setMessaging(messaging); @@ -152,7 +160,6 @@ public class NettyAcceptor implements ServerAcceptor { .option(ChannelOption.SO_REUSEADDR, true) .childOption(ChannelOption.SO_KEEPALIVE, true); try { - int port = Integer.parseInt(props.getProperty("websocket_port")); ChannelFuture f = b.bind(props.getProperty("host"), port); System.out.println("Web socket server started at port " + port + '.'); System.out.println("Open your browser and navigate to http://localhost:" + port + '/');