diff --git a/pom.xml b/pom.xml
index 8bf71c1fe..2757b4474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
mariadb-java-client
jar
mariadb-java-client
- 2.2.6
+ 2.2.7-SNAPSHOT
JDBC driver for MariaDB and MySQL
https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/
@@ -71,8 +71,8 @@
2.16
2
2
- 6
-
+ 7
+ -SNAPSHOT
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementClient.java b/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementClient.java
index f32a6772e..db376a7e5 100644
--- a/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementClient.java
+++ b/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementClient.java
@@ -282,8 +282,11 @@ public int[] executeBatch() throws SQLException {
return results.getCmdInformation().getUpdateCounts();
} catch (SQLException sqle) {
- if (results != null) results.commandEnd();
- throw executeBatchExceptionEpilogue(sqle, results.getCmdInformation(), size);
+ if (results != null) {
+ results.commandEnd();
+ throw executeBatchExceptionEpilogue(sqle, results.getCmdInformation(), size);
+ }
+ throw executeBatchExceptionEpilogue(sqle, null, size);
} finally {
executeBatchEpilogue();
lock.unlock();
@@ -323,8 +326,11 @@ public long[] executeLargeBatch() throws SQLException {
return results.getCmdInformation().getLargeUpdateCounts();
} catch (SQLException sqle) {
- results.commandEnd();
- throw executeBatchExceptionEpilogue(sqle, results.getCmdInformation(), size);
+ if (results != null) {
+ results.commandEnd();
+ throw executeBatchExceptionEpilogue(sqle, results.getCmdInformation(), size);
+ }
+ throw executeBatchExceptionEpilogue(sqle, null, size);
} finally {
executeBatchEpilogue();
lock.unlock();
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementServer.java b/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementServer.java
index 5cc036928..51f78bf29 100644
--- a/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementServer.java
+++ b/src/main/java/org/mariadb/jdbc/MariaDbPreparedStatementServer.java
@@ -300,8 +300,11 @@ private void executeBatchInternal(int queryParameterSize) throws SQLException {
results.commandEnd();
} catch (SQLException initialSqlEx) {
- results.commandEnd();
- throw executeBatchExceptionEpilogue(initialSqlEx, results.getCmdInformation(), queryParameterSize);
+ if (results != null) {
+ results.commandEnd();
+ throw executeBatchExceptionEpilogue(initialSqlEx, results.getCmdInformation(), queryParameterSize);
+ }
+ throw executeBatchExceptionEpilogue(initialSqlEx, null, queryParameterSize);
} finally {
executeBatchEpilogue();
lock.unlock();
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbStatement.java b/src/main/java/org/mariadb/jdbc/MariaDbStatement.java
index 5d4ef5a7a..a2d0cc3a6 100644
--- a/src/main/java/org/mariadb/jdbc/MariaDbStatement.java
+++ b/src/main/java/org/mariadb/jdbc/MariaDbStatement.java
@@ -1248,8 +1248,11 @@ public int[] executeBatch() throws SQLException {
return results.getCmdInformation().getUpdateCounts();
} catch (SQLException initialSqlEx) {
- if (results != null) results.commandEnd();
- throw executeBatchExceptionEpilogue(initialSqlEx, results.getCmdInformation(), size);
+ if (results != null) {
+ results.commandEnd();
+ throw executeBatchExceptionEpilogue(initialSqlEx, results.getCmdInformation(), size);
+ }
+ throw executeBatchExceptionEpilogue(initialSqlEx, null, size);
} finally {
executeBatchEpilogue();
lock.unlock();
diff --git a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
index 1e6879465..46afd8187 100644
--- a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
+++ b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
@@ -53,9 +53,9 @@
package org.mariadb.jdbc.internal.util.constant;
public final class Version {
- public static final String version = "2.2.6";
+ public static final String version = "2.2.7-SNAPSHOT";
public static final int majorVersion = 2;
public static final int minorVersion = 2;
- public static final int patchVersion = 6;
- public static final String qualifier = "";
+ public static final int patchVersion = 7;
+ public static final String qualifier = "-SNAPSHOT";
}
\ No newline at end of file