Protected access to variable m_preparedCount via synchronized

function to prevent multiple threads using automatic cursors on
the same connection from stomping over each others cursor.

Originally Jan Wieck, re-reported by Jack Orenstein after
accidental removal.

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
index 880b94d3c745af4626811a85912680341d981e60..33277a35896ecdf7396335a82ed1f5e63c7680a0 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
@@ -383,7 +383,7 @@ public abstract class AbstractJdbc1Statement implements BaseStatement
                        return m_executeSqlFragments;
                
                // First time through.
-               m_statementName = "JDBC_STATEMENT_" + m_preparedCount++;
+               m_statementName = "JDBC_STATEMENT_" + next_preparedCount();
                
                // Set up m_executeSqlFragments
                m_executeSqlFragments = new String[m_sqlFragments.length];
@@ -437,7 +437,7 @@ public abstract class AbstractJdbc1Statement implements BaseStatement
        {
                
                // Pinch the prepared count for our own nefarious purposes.
-               m_cursorName = "JDBC_CURS_" + m_preparedCount++;
+               m_cursorName = "JDBC_CURS_" + next_preparedCount();
                
                // Create a cursor declaration and initial fetch statement from the original query.
                int len = m_sqlFragments.length;