CallableStatement with "out" parameters: running the same statement twice could…

CallableStatement with "out" parameters: running the same statement twice could result in an exception ("parameter not set").

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Union queries: duplicate rows could be returned if the sub-queries contained "order by".
+<ul><li>CallableStatement with "out" parameters: running the same statement twice
+    could result in an exception ("parameter not set").
+</li><li>Union queries: duplicate rows could be returned if the sub-queries contained "order by".
 </li><li>The GEOMETRY data type now works for user defined functions that return a result set.
 </li><li>PostgreSQL compatibility: the PgServer was not working properly when the setting
     database_to_upper was set to false.

h2/src/main/org/h2/jdbc/JdbcCallableStatement.java

@@ -1578,7 +1578,7 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
             }
             checkIndexBounds(parameterIndex);
             ParameterInterface param = command.getParameters().get(--parameterIndex);
-            if (param.getParamValue() == null) {
+            if (!param.isValueSet()) {
                 param.setValue(ValueNull.INSTANCE, false);
             }
             outParameters.set(parameterIndex);

h2/src/test/org/h2/test/jdbc/TestCallableStatement.java

@@ -43,6 +43,7 @@ public class TestCallableStatement extends TestBase {
     public void test() throws SQLException {
         deleteDb("callableStatement");
         Connection conn = getConnection("callableStatement");
+        testOutParameter(conn);
         testUnsupportedOperations(conn);
         testGetters(conn);
         testCallWithResultSet(conn);
@@ -53,6 +54,19 @@ public class TestCallableStatement extends TestBase {
         deleteDb("callableStatement");
     }
     
+    private void testOutParameter(Connection conn) throws SQLException {
+        conn.createStatement().execute(
+                "create table test(id identity) as select null");
+        for (int i = 1; i < 20; i++) {
+            CallableStatement cs = conn.prepareCall("{ ? = call IDENTITY()}");
+            cs.registerOutParameter(1, Types.BIGINT);
+            cs.execute();
+            long id = cs.getLong(1);
+            assertEquals(1, id);
+            cs.close();
+        }
+    }
+    
     private void testUnsupportedOperations(Connection conn) throws SQLException {
         CallableStatement call;
         call = conn.prepareCall("select 10 as a");