|
From: Logs S. c. messages. <gvs...@li...> - 2013-11-23 15:31:13
|
Revision: 1068
http://sourceforge.net/p/gvsigce/code/1068
Author: vicgonco
Date: 2013-11-23 15:31:09 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Applying https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/revisions/38044
Modified Paths:
--------------
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/writers/JdbcWriter.java
trunk/libraries/libGDBMS/src/main/java/com/hardcode/gdbms/engine/data/db/DBDataSourceAdapter.java
Modified: trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/writers/JdbcWriter.java
===================================================================
--- trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/writers/JdbcWriter.java 2013-11-23 15:28:58 UTC (rev 1067)
+++ trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/writers/JdbcWriter.java 2013-11-23 15:31:09 UTC (rev 1068)
@@ -4,6 +4,7 @@
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.util.ArrayList;
import org.apache.log4j.Logger;
@@ -27,6 +28,8 @@
private boolean bCreateTable;
private ResultSetMetaData metaData = null;
+
+ protected ArrayList<Integer> rowsToDelete = null;
public JdbcWriter(){
}
@@ -37,9 +40,10 @@
System.out.println("INICIO CONEXI\xD3N DE ESCRITURA");
}
public void preProcess() throws StartWriterVisitorException {
- numRecord = 0;
try {
+ numRecord = 0;
conn.setAutoCommit(false);
+ rowsToDelete = new ArrayList<Integer>();
} catch (SQLException e) {
throw new StartWriterVisitorException(getName(), e);
}
@@ -93,8 +97,7 @@
}
break;
case IRowEdited.STATUS_DELETED:
- rs.absolute(editedRow.getIndex()+1);
- rs.deleteRow();
+ rowsToDelete.add(editedRow.getIndex()+1);
break;
}
numRecord++;
@@ -115,6 +118,11 @@
public void postProcess() throws StopWriterVisitorException {
try {
+ for (int i=rowsToDelete.size()-1; i>=0; i--) {
+ rs.absolute(rowsToDelete.get(i));
+ rs.deleteRow();
+ }
+
conn.commit();
} catch (SQLException e) {
try {
Modified: trunk/libraries/libGDBMS/src/main/java/com/hardcode/gdbms/engine/data/db/DBDataSourceAdapter.java
===================================================================
--- trunk/libraries/libGDBMS/src/main/java/com/hardcode/gdbms/engine/data/db/DBDataSourceAdapter.java 2013-11-23 15:28:58 UTC (rev 1067)
+++ trunk/libraries/libGDBMS/src/main/java/com/hardcode/gdbms/engine/data/db/DBDataSourceAdapter.java 2013-11-23 15:31:09 UTC (rev 1068)
@@ -258,7 +258,7 @@
sem = 0;
driver.close();
- if (this.con == null) {
+ if (this.con != null) {
con.close();
con = null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|