[CONJ-539] better message when server close connection

mariadb-corporation · Oct 15, 2017 · 8c59138 · 8c59138
1 parent fde60c1
commit 8c59138
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/io/input/DecompressPacketInputStream.java b/src/main/java/org/mariadb/jdbc/internal/io/input/DecompressPacketInputStream.java
@@ -191,7 +191,8 @@ private void readBlocking(byte[] arr, int length) throws IOException {
         do {
             int count = inputStream.read(arr, off, remaining);
             if (count < 0) {
-                throw new EOFException("unexpected end of stream, read " + (length - remaining) + " bytes from " + length);
+                throw new EOFException("unexpected end of stream, read " + (length - remaining) + " bytes from " + length
+                        + " (socket was closed by server)");
             }
             remaining -= count;
             off += count;

diff --git a/src/main/java/org/mariadb/jdbc/internal/io/input/StandardPacketInputStream.java b/src/main/java/org/mariadb/jdbc/internal/io/input/StandardPacketInputStream.java
@@ -237,7 +237,7 @@ public byte[] getPacketArray(boolean reUsable) throws IOException {
         do {
             int count = inputStream.read(header, off, remaining);
             if (count < 0) {
-                throw new EOFException("unexpected end of stream, read " + off + " bytes from 4");
+                throw new EOFException("unexpected end of stream, read " + off + " bytes from 4 (socket was closed by server)");
             }
             remaining -= count;
             off += count;
@@ -260,7 +260,8 @@ public byte[] getPacketArray(boolean reUsable) throws IOException {
         do {
             int count = inputStream.read(rawBytes, off, remaining);
             if (count < 0) {
-                throw new EOFException("unexpected end of stream, read " + (lastPacketLength - remaining) + " bytes from " + lastPacketLength);
+                throw new EOFException("unexpected end of stream, read " + (lastPacketLength - remaining) + " bytes from " + lastPacketLength
+                        + " (socket was closed by server)");
             }
             remaining -= count;
             off += count;

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
@@ -1756,7 +1756,7 @@ public SQLException handleIoException(IOException initialException) {
             try {
                 connect();
             } catch (SQLException queryException) {
-                return new SQLNonTransientConnectionException("Could not send query: " + initialException.getMessage()
+                return new SQLNonTransientConnectionException(initialException.getMessage()
                         + "\nError during reconnection" + getTraces(), CONNECTION_EXCEPTION.getSqlState(), initialException);
             }
 
@@ -1771,7 +1771,7 @@ public SQLException handleIoException(IOException initialException) {
                     + writer.getMaxAllowedPacket() + ")" + getTraces(), UNDEFINED_SQLSTATE.getSqlState(), initialException);
         }
 
-        return new SQLException("Could not send query: " + initialException.getMessage() + getTraces(),
+        return new SQLException(initialException.getMessage() + getTraces(),
                 driverPreventError ? UNDEFINED_SQLSTATE.getSqlState() : CONNECTION_EXCEPTION.getSqlState(), initialException);
 
     }