Try another exception instead of EOF

Author: timoninmaxim

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryIoSession.java

@@ -67,6 +67,9 @@ public class TcpDiscoveryIoSession {
     /** */
     private final TcpDiscoverySpi spi;
 
+    /** Loads discovery messages classes during java deserialization. */
+    private final ClassLoader clsLdr;
+
     /** */
     private final Socket sock;
 
@@ -96,6 +99,8 @@ public class TcpDiscoveryIoSession {
         this.sock = sock;
         this.spi = spi;
 
+        clsLdr = U.resolveClassLoader(spi.ignite().configuration());
+
         msgBuf = ByteBuffer.allocate(MSG_BUFFER_SIZE);
 
         msgWriter = new DirectMessageWriter(spi.messageFactory());
@@ -155,13 +160,13 @@ <T> T readMessage() throws IgniteCheckedException, IOException {
         byte serMode = (byte)in.read();
 
         if (JAVA_SERIALIZATION == serMode)
-            return U.unmarshal(spi.marshaller(), in, spi.classLoader());
+            return U.unmarshal(spi.marshaller(), in, clsLdr);
 
         try {
             if (MESSAGE_SERIALIZATION != serMode) {
                 detectSslAlert(serMode, in);
 
-                throw new EOFException();
+                throw new IgniteCheckedException("Received unexpected byte while reading discovery message: " + serMode);
             }
 
             byte b0 = (byte)in.read();

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java

@@ -2425,13 +2425,6 @@ protected Marshaller marshaller() {
         return marsh;
     }
 
-    /**
-     * @return Ignite class loader.
-     */
-    ClassLoader classLoader() {
-        return U.resolveClassLoader(ignite.configuration());
-    }
-
     /** {@inheritDoc} */
     @Override public TcpDiscoverySpi setName(String name) {
         super.setName(name);