Changeset: 74585867b8e8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74585867b8e8
Modified Files:
        java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
        java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
Branch: Oct2010
Log Message:

remove commit that went to the wrong branch


diffs (81 lines):

diff -r 4a5fded5bea7 -r 74585867b8e8 
java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java  Wed Dec 15 
11:49:59 2010 +0100
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java  Wed Dec 15 
12:36:05 2010 +0100
@@ -62,8 +62,6 @@
 
        private final String[] values;
        private final StringBuffer buf;
-       
-       private final MonetConnection connection;
 
        /* only parse the date patterns once, use multiple times */
        /** Format of a timestamp with RFC822 time zone */
@@ -119,8 +117,6 @@
                values = new String[size];
                buf = new StringBuffer(6 + 12 * size);
 
-               this.connection = connection;
-
                // fill the arrays
                ResultSet rs = super.getResultSet();
                for (int i = 0; rs.next(); i++) {
@@ -163,8 +159,6 @@
                buf = null;
                id = -1;
                size = -1;
-
-               this.connection = connection;
        }
 
        //== methods interface PreparedStatement
@@ -1328,38 +1322,6 @@
                throw new SQLException("Operation currently not supported!");
        }
 
-       /**
-        * Releases this PreparedStatement object's database and JDBC
-        * resources immediately instead of waiting for this to happen when
-        * it is automatically closed.  It is generally good practice to
-        * release resources as soon as you are finished with them to avoid
-        * tying up database resources.
-        * <br /><br />
-        * Calling the method close on a PreparedStatement object that is
-        * already closed has no effect.
-        * <br /><br />
-        * <b>Note:</b> A PreparedStatement object is automatically closed
-        * when it is garbage collected. When a Statement object is closed,
-        * its current ResultSet object, if one exists, is also closed. 
-        */
-       public void close() {
-               try {
-                       if (!closed && id != -1)
-                               connection.sendControlCommand("close " + id);
-               } catch (SQLException e) {
-                       // probably server closed connection
-               }
-               super.close();
-       }
-
-       /**
-        * Call close to release the server-sided handle for this
-        * PreparedStatement.
-        */
-       protected void finalize() {
-               close();
-       }
-
        //== end methods interface PreparedStatement
 
        /**
diff -r 4a5fded5bea7 -r 74585867b8e8 
java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetStatement.java  Wed Dec 15 11:49:59 
2010 +0100
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetStatement.java  Wed Dec 15 12:36:05 
2010 +0100
@@ -59,7 +59,7 @@
        /** The warnings this Statement object generated */
        private SQLWarning warnings;
        /** Whether this Statement object is closed or not */
-       protected boolean closed;
+       private boolean closed;
        /** The size of the blocks of results to ask for at the server */
        private int fetchSize = 0;
        /** The maximum number of rows to return in a ResultSet */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to