Few critical bugs are fixed

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.esotericsoftware</groupId>
     <artifactId>kryonet</artifactId>
-    <version>2.22.0-RC1</version>
+    <version>2.22.0-RC1-dsx-MASTER-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>kryonet</name>
@@ -48,9 +48,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.esotericsoftware.kryo</groupId>
+            <groupId>com.esotericsoftware</groupId>
             <artifactId>kryo</artifactId>
-            <version>2.24.0</version>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.esotericsoftware</groupId>
@@ -65,4 +65,14 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>nexus-snapshot</id>
+            <url>https://nexus.dsx.cool/repository/maven-snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>nexus-release</id>
+            <url>https://nexus.dsx.cool/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
 </project>

src/com/esotericsoftware/kryonet/Client.java

@@ -70,6 +70,7 @@ public class Client extends Connection implements EndPoint {
 	private int connectUdpPort;
 	private boolean isClosed;
 	private ClientDiscoveryHandler discoveryHandler;
+	private boolean checkRegisteredClasses;
 
 	/** Creates a Client with a write buffer size of 8192 and an object buffer size of 2048. */
 	public Client () {
@@ -123,6 +124,14 @@ public Kryo getKryo () {
 		return serialization instanceof KryoSerialization ? ((KryoSerialization)serialization).getKryo() : null;
 	}
 
+	public void setCheckRegisteredClasses(boolean value) {
+		checkRegisteredClasses = value;
+	}
+
+	public boolean checkRegisteredClasses() {
+		return checkRegisteredClasses;
+	}
+
 	/** Opens a TCP only client.
 	 * @see #connect(int, InetAddress, int, int) */
 	public void connect (int timeout, String host, int tcpPort) throws IOException {

src/com/esotericsoftware/kryonet/Connection.java

@@ -27,7 +27,10 @@
 import java.nio.channels.SocketChannel;
 
 import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Registration;
 import com.esotericsoftware.kryonet.FrameworkMessage.Ping;
+import com.esotericsoftware.kryonet.FrameworkMessage.RegisteredClassesInfo;
+import com.esotericsoftware.minlog.Log;
 
 import static com.esotericsoftware.minlog.Log.*;
 
@@ -256,7 +259,7 @@ void notifyIdle () {
 		}
 	}
 
-	void notifyReceived (Object object) {
+	void notifyReceived (Object object) throws IOException {
 		if (object instanceof Ping) {
 			Ping ping = (Ping)object;
 			if (ping.isReply) {
@@ -268,6 +271,10 @@ void notifyReceived (Object object) {
 				ping.isReply = true;
 				sendTCP(ping);
 			}
+		} else if (object instanceof RegisteredClassesInfo) {
+			if (endPoint.checkRegisteredClasses())
+				checkRegisteredClasses((RegisteredClassesInfo) object);
+			return;
 		}
 		Listener[] listeners = this.listeners;
 		for (int i = 0, n = listeners.length; i < n; i++)
@@ -337,4 +344,47 @@ void setConnected (boolean isConnected) {
 		this.isConnected = isConnected;
 		if (isConnected && name == null) name = "Connection " + id;
 	}
+
+	public void sendRegisteredClasses () {
+		RegisteredClassesInfo info = new RegisteredClassesInfo();
+		info.classes = getRegisteredClasses(endPoint.getKryo());
+		sendTCP(info);
+	}
+
+	private String getRegisteredClasses(Kryo kryo) {
+		if (kryo == null)
+			return null;
+		StringBuffer buffer = new StringBuffer();
+		for(int i = 0; i < Integer.MAX_VALUE; i++) {
+			Registration registration = kryo.getRegistration(i);
+			if (registration == null)
+				break;
+			buffer.append(';');
+			buffer.append(registration.getType().getCanonicalName());
+		}
+		return buffer.toString();
+	}
+
+	private void checkRegisteredClasses(RegisteredClassesInfo info) throws IOException {
+		String classes = getRegisteredClasses(endPoint.getKryo());
+		if (info.classes != null && classes != null && !info.classes.equals(classes)) {
+			String[] otherClasses = info.classes.split(";");
+			String[] thisClasses = classes.split(";");
+			for(int i = 0; i < otherClasses.length; i++) {
+				if (thisClasses.length == i) {
+					Log.error("kryonet", "Connection.notifyReceived. Registered classes mismatch. Not all other classes are registered. First unregistered class= '" + otherClasses[i] + "'");
+					throw new IOException("Registered classes mismatch. Not all other classes are registered. First unregistered class= '" + otherClasses[i] + "'");
+				} else if (!otherClasses[i].equals(thisClasses[i])) {
+					Log.error("kryonet", "Connection.notifyReceived. Registered classes mismatch. First difference at index " + i + " this class = '" + thisClasses[i] + "' other class = '" + otherClasses[i] + "'");
+					throw new IOException("Registered classes mismatch. First difference at index " + i + " this class = '" + thisClasses[i] + "' other class = '" + otherClasses[i] + "'");
+				}
+			}
+			if (thisClasses.length > otherClasses.length) {
+				Log.error("kryonet", "Connection.notifyReceived. Registered classes mismatch. Not all this classes are registered. First unregistered class= '" + thisClasses[otherClasses.length] + "'");
+				throw new IOException("Registered classes mismatch. Not all this classes are registered. First unregistered class= '" + thisClasses[otherClasses.length] + "'");
+			} else {
+				Log.error("kryonet", "Connection.notifyReceived. It looks like registered classes mismatch, but no difference found");
+			}
+		}
+	}
 }

src/com/esotericsoftware/kryonet/EndPoint.java

@@ -59,4 +59,8 @@ public interface EndPoint extends Runnable {
 	 * not being used.
 	 * @return May be null. */
 	public Kryo getKryo ();
+
+	public void setCheckRegisteredClasses(boolean value);
+
+	public boolean checkRegisteredClasses();
 }

src/com/esotericsoftware/kryonet/FrameworkMessage.java

@@ -50,4 +50,9 @@ static public class Ping implements FrameworkMessage {
 		public int id;
 		public boolean isReply;
 	}
+
+	/** Internal message to check are registered classes on client and server side equal. */
+	static public class RegisteredClassesInfo implements FrameworkMessage {
+		public String classes;
+	}
 }

src/com/esotericsoftware/kryonet/JsonSerialization.java

@@ -33,6 +33,7 @@
 import com.esotericsoftware.kryonet.FrameworkMessage.Ping;
 import com.esotericsoftware.kryonet.FrameworkMessage.RegisterTCP;
 import com.esotericsoftware.kryonet.FrameworkMessage.RegisterUDP;
+import com.esotericsoftware.kryonet.FrameworkMessage.RegisteredClassesInfo;
 
 public class JsonSerialization implements Serialization {
 	private final Json json = new Json();
@@ -48,6 +49,7 @@ public JsonSerialization () {
 		json.addClassTag("KeepAlive", KeepAlive.class);
 		json.addClassTag("DiscoverHost", DiscoverHost.class);
 		json.addClassTag("Ping", Ping.class);
+		json.addClassTag("RegisteredClassesInfo", RegisteredClassesInfo.class);
 
 		json.setWriter(writer);
 	}

src/com/esotericsoftware/kryonet/KryoSerialization.java

@@ -29,6 +29,7 @@
 import com.esotericsoftware.kryonet.FrameworkMessage.Ping;
 import com.esotericsoftware.kryonet.FrameworkMessage.RegisterTCP;
 import com.esotericsoftware.kryonet.FrameworkMessage.RegisterUDP;
+import com.esotericsoftware.kryonet.FrameworkMessage.RegisteredClassesInfo;
 
 import java.nio.ByteBuffer;
 
@@ -51,6 +52,7 @@ public KryoSerialization (Kryo kryo) {
 		kryo.register(KeepAlive.class);
 		kryo.register(DiscoverHost.class);
 		kryo.register(Ping.class);
+		kryo.register(RegisteredClassesInfo.class);
 
 		input = new ByteBufferInput();
 		output = new ByteBufferOutput();

src/com/esotericsoftware/kryonet/Server.java

@@ -58,6 +58,7 @@ public class Server implements EndPoint {
 	private Object updateLock = new Object();
 	private Thread updateThread;
 	private ServerDiscoveryHandler discoveryHandler;
+	private boolean checkRegisteredClasses;
 
 	private Listener dispatchListener = new Listener() {
 		public void connected (Connection connection) {
@@ -136,6 +137,14 @@ public Kryo getKryo () {
 		return serialization instanceof KryoSerialization ? ((KryoSerialization)serialization).getKryo() : null;
 	}
 
+	public void setCheckRegisteredClasses(boolean value) {
+		checkRegisteredClasses = value;
+	}
+
+	public boolean checkRegisteredClasses() {
+		return checkRegisteredClasses;
+	}
+
 	/** Opens a TCP only server.
 	 * @throws IOException if the server could not be opened. */
 	public void bind (int tcpPort) throws IOException {
@@ -431,6 +440,8 @@ private void acceptOperation (SocketChannel socketChannel) {
 			RegisterTCP registerConnection = new RegisterTCP();
 			registerConnection.connectionID = id;
 			connection.sendTCP(registerConnection);
+			if (checkRegisteredClasses)
+				connection.sendRegisteredClasses();
 
 			if (udp == null) connection.notifyConnected();
 		} catch (IOException ex) {

src/com/esotericsoftware/kryonet/TcpConnection.java

@@ -46,10 +46,14 @@ class TcpConnection {
 	private volatile long lastWriteTime, lastReadTime;
 	private int currentObjectLength;
 	private final Object writeLock = new Object();
+	private final int objectBufferSize;
+	private final int lengthLength;
 
 	public TcpConnection (Serialization serialization, int writeBufferSize, int objectBufferSize) {
 		this.serialization = serialization;
-		writeBuffer = ByteBuffer.allocate(writeBufferSize);
+		this.objectBufferSize = objectBufferSize;
+		lengthLength = serialization.getLengthLength();
+		writeBuffer = ByteBuffer.allocate(Math.max(writeBufferSize, lengthLength + objectBufferSize));
 		readBuffer = ByteBuffer.allocate(objectBufferSize);
 		readBuffer.flip();
 	}
@@ -199,8 +203,21 @@ public int send (Connection connection, Object object) throws IOException {
 		SocketChannel socketChannel = this.socketChannel;
 		if (socketChannel == null) throw new SocketException("Connection is closed.");
 		synchronized (writeLock) {
-			int start = writeBuffer.position();
 			int lengthLength = serialization.getLengthLength();
+
+			//wait while buffer has enough free space.
+			//thats because message length will be put only after the whole message will be serialized
+            while (writeBuffer.capacity() < writeBuffer.position() + lengthLength + objectBufferSize) {
+                try {
+                    Thread.sleep(10);
+                } catch (InterruptedException e) {
+                    break;
+                }
+                writeToSocket();
+	        }
+
+			// Leave room for length.
+			int start = writeBuffer.position();
 			try {
 				// Leave room for length.
 				writeBuffer.position(writeBuffer.position() + lengthLength);