This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 7537323 - Removed some invalid configuration options raw sockets
don't support.
7537323 is described below
commit 7537323ae0e525bb6616e0d4d1a6ade6b157fd66
Author: Christofer Dutz <christofer.d...@c-ware.de>
AuthorDate: Fri Aug 23 19:36:42 2019 +0200
- Removed some invalid configuration options raw sockets don't support.
---
.../org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java | 2 --
.../org/apache/plc4x/java/base/connection/SerialChannelFactory.java | 2 --
.../apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java | 2 --
3 files changed, 6 deletions(-)
diff --git
a/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
b/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
index fbaa680..80684e6 100644
---
a/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
+++
b/plc4j/protocols/driver-bases/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
@@ -62,8 +62,6 @@ public class RawSocketChannelFactory implements
ChannelFactory {
bootstrap.group(workerGroup);
bootstrap.channel(RawSocketChannel.class);
bootstrap.option(RawSocketChannelOption.PACKET_HANDLER, new
TcpIpPacketHandler());
- bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
- bootstrap.option(ChannelOption.TCP_NODELAY, true);
// TODO we should use an explicit (configurable?) timeout here
// bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
bootstrap.handler(channelHandler);
diff --git
a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannelFactory.java
b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannelFactory.java
index 23efad5..df44635 100644
---
a/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannelFactory.java
+++
b/plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannelFactory.java
@@ -45,8 +45,6 @@ public class SerialChannelFactory implements ChannelFactory {
Bootstrap bootstrap = new Bootstrap();
bootstrap.group(workerGroup);
bootstrap.channel(JSerialCommChannel.class);
-// bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
-// bootstrap.option(ChannelOption.TCP_NODELAY, true);
bootstrap.handler(channelHandler);
// Start the client.
ChannelFuture f = bootstrap.connect(address).sync();
diff --git
a/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java
b/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java
index 9f688c7..e7566b8 100644
---
a/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java
+++
b/plc4j/utils/raw-sockets/src/test/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelTest.java
@@ -52,8 +52,6 @@ public class RawSocketChannelTest {
Bootstrap bootstrap = new Bootstrap();
bootstrap.group(workerGroup);
bootstrap.channel(RawSocketChannel.class);
- bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
- bootstrap.option(ChannelOption.TCP_NODELAY, true);
// TODO we should use an explicit (configurable?) timeout here
// bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000);
bootstrap.handler(new ChannelInitializer<RawSocketChannel>() {
