fix TCPServer -> v0.2.1

Author: lecousin

README.md

@@ -17,7 +17,7 @@ Main functionalities:
 ### Current version - branch master
 
 [![Maven Central](https://img.shields.io/maven-central/v/net.lecousin.framework.network/core.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22net.lecousin.framework.network%22%20AND%20a%3A%22core%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-0.2.0-brightgreen.svg)](https://www.javadoc.io/doc/net.lecousin.framework.network/core/0.2.0)
+[![Javadoc](https://img.shields.io/badge/javadoc-0.2.1-brightgreen.svg)](https://www.javadoc.io/doc/net.lecousin.framework.network/core/0.2.1)
 
 ![build status](https://travis-ci.org/lecousin/java-framework-network-core.svg?branch=master "Build Status")
 ![build status](https://ci.appveyor.com/api/projects/status/github/lecousin/java-framework-network-core?branch=master&svg=true "Build Status")

pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>net.lecousin.framework.network</groupId>
   <artifactId>core</artifactId>
-  <version>0.2.0</version>
+  <version>0.2.1</version>
 
   <name>lecousin.net Java framework - network - core</name>
   <description>Core network functionalities</description>
@@ -55,7 +55,7 @@
   	<dependency>
   		<groupId>net.lecousin</groupId>
   		<artifactId>core</artifactId>
-		<version>0.9.7</version>
+		<version>0.9.8</version>
   	</dependency>
   	<dependency>
   		<groupId>commons-logging</groupId>
@@ -77,7 +77,7 @@
   	<dependency>
   		<groupId>net.lecousin</groupId>
   		<artifactId>core</artifactId>
-		<version>0.9.7</version>
+		<version>0.9.8</version>
   		<type>test-jar</type>
   		<scope>test</scope>
   	</dependency>

src/main/java/net/lecousin/framework/network/NetworkManager.java

@@ -37,6 +37,7 @@
 public class NetworkManager implements Closeable {
 
 	public static final Log logger = LogFactory.getLog("network");
+	public static final Log dataLogger = LogFactory.getLog("network-data");
 
 	/**
 	 * Base interface for a listener, with a channelClosed event.
@@ -288,8 +289,25 @@ public void run() {
 						} else {
 							Attachment listeners = (Attachment)key.attachment();
 							try {
-								key.interestOps(key.interestOps() | req.newOps);
-								listeners.set(req.newOps, req.listener, req.timeout);
+								int curOps = key.interestOps();
+								int conflict = curOps & req.newOps;
+								if (conflict == 0) {
+									key.interestOps(curOps | req.newOps);
+									listeners.set(req.newOps, req.listener, req.timeout);
+								} else {
+									if ((conflict & SelectionKey.OP_ACCEPT) != 0)
+										((Server)req.listener).acceptError(
+											new IOException("Already registered for accept operation"));
+									if ((conflict & SelectionKey.OP_CONNECT) != 0)
+										((Client)req.listener).connectionFailed(
+											new IOException("Already registered for connect operation"));
+									if ((conflict & SelectionKey.OP_READ) != 0)
+										((Receiver)req.listener).receiveError(
+										new IOException("Already registered for read operation"), null);
+									if ((conflict & SelectionKey.OP_WRITE) != 0)
+										logger.error(
+											new IOException("Already registered for write operation"));
+								}
 							} catch (CancelledKeyException e) {
 								listeners.channelClosed();
 							}
@@ -369,13 +387,13 @@ public void run() {
 										tcp.endOfInput(buffer);
 									} else {
 										buffer.flip();
-										if (logger.isTraceEnabled()) {
+										if (dataLogger.isTraceEnabled()) {
 											StringBuilder s = new StringBuilder(nb * 5 + 256);
 											s.append(nb).append(" bytes received on ");
 											s.append(key.channel().toString());
 											s.append("\r\n");
 											DebugUtil.dumpHex(s, buffer);
-											logger.trace(s.toString());
+											dataLogger.trace(s.toString());
 										}
 										if (!tcp.received(buffer)) {
 											try {

src/main/java/net/lecousin/framework/network/client/TCPClient.java

@@ -436,12 +436,12 @@ public Void run() {
 	public ISynchronizationPoint<IOException> send(ByteBuffer data) {
 		if (logger.isDebugEnabled())
 			logger.debug("Sending data: " + data.remaining());
-		if (logger.isTraceEnabled()) {
+		if (NetworkManager.dataLogger.isTraceEnabled()) {
 			if (data.hasArray()) {
 				StringBuilder s = new StringBuilder(data.remaining() * 4);
-				s.append("Data to send:\r\n");
+				s.append("TCPClient: Data to send to server:\r\n");
 				DebugUtil.dumpHex(s, data.array(), data.arrayOffset() + data.position(), data.remaining());
-				logger.trace(s.toString());
+				NetworkManager.dataLogger.trace(s.toString());
 			}
 		}
 		if (data.remaining() == 0)

src/main/java/net/lecousin/framework/network/server/TCPServer.java

@@ -239,17 +239,18 @@ synchronized SynchronizationPoint<IOException> send(ByteBuffer buf, boolean clos
 			if (channel == null) throw new ClosedChannelException();
 			// ask the protocol to do any needed processing before sending the data
 			LinkedList<ByteBuffer> buffers = protocol.prepareDataToSend(publicInterface, buf);
+			boolean waitBefore = waitToSend;
 			if (!waitToSend) {
 				// we can start sending data right away
 				ByteBuffer buffer = null;
 				while (buffer != null || !buffers.isEmpty()) {
 					if (buffer == null)
 						buffer = buffers.removeFirst();
-					if (NetworkManager.logger.isTraceEnabled()) {
+					if (NetworkManager.dataLogger.isTraceEnabled()) {
 						StringBuilder s = new StringBuilder(128 + buffer.remaining() * 5);
 						s.append("Sending ").append(buffer.remaining()).append(" bytes to client:\r\n");
 						DebugUtil.dumpHex(s, buffer);
-						NetworkManager.logger.trace(s.toString());
+						NetworkManager.dataLogger.trace(s.toString());
 					}
 					int nb;
 					try { nb = channel.write(buffer); }
@@ -280,7 +281,7 @@ synchronized SynchronizationPoint<IOException> send(ByteBuffer buf, boolean clos
 				outputBuffers.add(new Pair<>(b, buffers.isEmpty() ? sp : null));
 			}
 			closeAfterLastOutput = closeAfter;
-			if (dataToSendProvider == null)
+			if (!waitBefore && dataToSendProvider == null)
 				manager.register(channel, SelectionKey.OP_WRITE, this, 0);
 			return sp;
 		}
@@ -291,12 +292,13 @@ public void readyToSend() {
 				@Override
 				public Void run() {
 					synchronized (Client.this) {
+						if (outputBuffers == null) return null;
 						if (outputBuffers.isEmpty() && dataToSendProvider != null) {
 							outputBuffers.add(new Pair<>(dataToSendProvider.provide(), dataToSendSP));
 							dataToSendProvider = null;
 							dataToSendSP = null;
 						}
-						while (!outputBuffers.isEmpty()) {
+						while (outputBuffers != null && !outputBuffers.isEmpty()) {
 							Pair<ByteBuffer,SynchronizationPoint<IOException>> toWrite = outputBuffers.getFirst();
 							int nb;
 							do {
@@ -326,6 +328,7 @@ public Void run() {
 							} while (nb > 0);
 							if (nb == 0) break; // cannot write anymore
 						}
+						if (outputBuffers == null) return null;
 						if (outputBuffers.isEmpty()) {
 							// we are done with all data to be sent
 							if (closeAfterLastOutput) {

src/main/java/net/lecousin/framework/network/server/protocol/ServerProtocol.java

@@ -31,6 +31,8 @@ public interface ServerProtocol {
 	 * The implementation should get the data, then process it in a separate thread/task to avoid blocking the
 	 * network manager thread.
 	 * Once the given buffer has been processed, the onbufferavailable should be called to signal the given buffer can be reused.
+	 * When calling onbufferavailable, if some data is remaining the method dataReceivedFromClient will be called again
+	 * so the implementation must ensure there is no remaining data in the buffer.
 	 * Most implementations will return false, and call the method waitForData later on, because it starts a separate
 	 * task to process the message. Because of this, if returning true, new data may arrive before the previous
 	 * task has been executed and data may be processed in a wrong order, or some concurrency issues may come in the data

src/test/java/net/lecousin/framework/network/test/AbstractNetworkTest.java

@@ -20,6 +20,7 @@ public static void initNetwork() throws Exception {
 		// logging
 		LoggerFactory log = LCCore.getApplication().getLoggerFactory();
 		log.getLogger("network").setLevel(Level.TRACE);
+		log.getLogger("network-data").setLevel(Level.TRACE);
 		log.getLogger("SSL").setLevel(Level.TRACE);
 		log.getLogger(TCPClient.class).setLevel(Level.TRACE);
 		log.getLogger(SSLClient.class).setLevel(Level.TRACE);

src/test/java/net/lecousin/framework/network/tests/TestTCP.java

@@ -232,6 +232,7 @@ public void testSSLClient() throws Exception {
 	@Test(timeout=120000)
 	public void testEcho() throws Exception {
 		LCCore.getApplication().getLoggerFactory().getLogger("network").setLevel(Level.DEBUG);
+		LCCore.getApplication().getLoggerFactory().getLogger("network-data").setLevel(Level.DEBUG);
 		LCCore.getApplication().getLoggerFactory().getLogger(TCPClient.class).setLevel(Level.DEBUG);
 		TCPClient client = new TCPClient();
 		SynchronizationPoint<IOException> sp = client.connect(new InetSocketAddress("localhost", 9997), 10000, new SocketOptionValue<>(StandardSocketOptions.SO_SNDBUF, Integer.valueOf(512)));
@@ -245,6 +246,7 @@ public void testEcho() throws Exception {
 			Assert.assertArrayEquals(data, client.getReceiver().readBytes(data.length, 10000).blockResult(0));
 		client.close();
 		LCCore.getApplication().getLoggerFactory().getLogger(TCPClient.class).setLevel(Level.TRACE);
+		LCCore.getApplication().getLoggerFactory().getLogger("network-data").setLevel(Level.TRACE);
 		LCCore.getApplication().getLoggerFactory().getLogger("network").setLevel(Level.TRACE);
 	}