Runtime: Fix NullpointerException in connection commit introduced in c…

…921b97
speedment · Sep 9, 2016 · 96b835b · 96b835b
1 parent 443ae7a
commit 96b835b
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/runtime/src/main/java/com/speedment/runtime/internal/db/AsynchronousQueryResultImpl.java b/runtime/src/main/java/com/speedment/runtime/internal/db/AsynchronousQueryResultImpl.java
@@ -55,7 +55,7 @@ public final class AsynchronousQueryResultImpl<T> implements AsynchronousQueryRe
     private Function<ResultSet, T> rsMapper;
     private final Supplier<Connection> connectionSupplier;
     private ParallelStrategy parallelStrategy;
-    private Connection connection;
+    private Connection connection;  // null allowed if the stream() method is not run
     private PreparedStatement ps;
     private ResultSet rs;
     private State state;
@@ -71,8 +71,8 @@ public AsynchronousQueryResultImpl(
         Supplier<Connection> connectionSupplier
     ) {
         setSql(sql); // requireNonNull in setter
-        setValues(values);
-        setRsMapper(rsMapper);
+        setValues(values); // requireNonNull in setter
+        setRsMapper(rsMapper); // requireNonNull in setter
         this.connectionSupplier = requireNonNull(connectionSupplier);
         parallelStrategy = ParallelStrategy.DEFAULT;
         setState(State.INIT);
@@ -103,16 +103,21 @@ public Stream<T> stream() {
     public void close() {
         closeSilently(rs);
         closeSilently(ps);
+        commitSilently(connection);
+        setState(State.CLOSED);
+    }
+
+    private void commitSilently(Connection connection) {
         try {
-            connection.commit();
+            if (connection != null) {
+                connection.commit();
+            }
         } catch (SQLException e) {
             LOGGER.error(e, "Failed to commit connection upon close");
         }
-        closeSilently(connection);
-        setState(State.CLOSED);
     }
 
-    protected void closeSilently(final AutoCloseable closeable) {
+    private void closeSilently(final AutoCloseable closeable) {
         try {
             if (closeable != null) {
                 closeable.close();