/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 53197

Added by Konstantina Galouni over 5 years ago

SqlStore.java:
close ResultSet and Statement in finally clause
return CachedRowSet instead of ResultSet when needed (avoids problems with closed connection, nothing else changes because CachedRowSet extends ResultSet)

     	 */
     	public ResultSet executePreparedQuery(String q, ArrayList<Object> data) throws SQLException, SQLStoreException {
     			ResultSet rs = sqlStore.executeQuery(q, data);
     			return rs;
     		ResultSet rs = sqlStore.executeQuery(q, data);
     		return rs;
     			//return sqlStore.getResults(rs);
+    	}
-...
     		} catch (Exception e)
+    		{
                 log.debug("\n Query is:"+q);
     			log.debug("\n Query is:" + q);
     			log.error("Fail to execute query:" + q, e);
     			throw new Exception(e);
+    		}

     package eu.dnetlib.data.claimsDemo;
     import com.sun.rowset.CachedRowSetImpl;
     import org.apache.log4j.Logger;
     import javax.sql.rowset.CachedRowSet;
     import java.sql.*;
     import java.util.ArrayList;
     import java.util.List;
-...
+    	}
     	/**
     	 * Closes Database Statement.
+    	 *
     	 * @throws SQLException
     	 */
     	public void closeStatement(Statement st) throws SQLException {
     		log.debug("Closing Statement...");
     		if (st != null) {
     			st.close();
+    		}
+    	}
     	/**
     	 * Closes Database Resultset.
+    	 *
     	 * @throws SQLException
     	 */
     	public void closeResultset(ResultSet rs) throws SQLException {
     		log.debug("Closing Resultset...");
     		if (rs != null) {
     			rs.close();
+    		}
+    	}
     	/**
     	 * Closes Database connections.
+    	 *
     	 * @throws SQLException
     	 */
     	public void closeConnection() throws SQLException {
     		log.debug("Closing Connection...");
     		if (connection != null) {
     			connection.close();
+    		}
     			if (connection != null) {
     				connection.close();
+    			}
+    	}
     	/**
-...
     	 */
     	public ResultSet executeQuery(String command) throws SQLException, SQLStoreException {
     		log.debug("  Executing   Query ... " + command);
     		Statement st = null;
     		ResultSet rs = null;
     		try{
     			this.getConnection();
      			Statement st = connection.createStatement();
      			st = connection.createStatement();
     			if (st.execute(command)) {
     				ResultSet rs = st.getResultSet();
     				rs = st.getResultSet();
     				CachedRowSet rowset = new CachedRowSetImpl();
     				rowset.populate(rs);
     				return rowset;
     				//st.close();
     				return rs;
     				//return rs;
     			} else {
     				log.error("Fail to execute command " + st.getWarnings());
     				throw  new SQLStoreException("Fail to execute command " + st.getWarnings());
-...
+    			}
     		} finally {
     			this.closeResultset(rs);
     			this.closeStatement(st);
     			this.closeConnection();
+    		}
-...
     	 * @return
     	 * @throws SQLException
     	 */
     	public ResultSet executeQuery(String command, ArrayList<Object> values) throws SQLException, SQLStoreException {
     	public CachedRowSet executeQuery(String command, ArrayList<Object> values) throws SQLException, SQLStoreException {
     		log.debug("  Executing   Query ...\n" + command +"\n"+values);
     		PreparedStatement st = null;
     		ResultSet rs = null;
     		try{
     			this.getConnection();
     			PreparedStatement st = connection.prepareStatement(command);
     			st = connection.prepareStatement(command);
     			int pos = 1;
-...
+    			}
     			if (st.execute()) {
     				ResultSet rs = st.getResultSet();
     			//	st.close();
     				return rs;
     				rs = st.getResultSet();
     				CachedRowSet rowset = new CachedRowSetImpl();
     				rowset.populate(rs);
     				return rowset;
     				//return rs;
     			} else {
     				log.error("Fail to execute command " + st.getWarnings());
     				throw  new SQLStoreException("Fail to execute command " + st.getWarnings());
+    			}
     		} finally {
     			this.closeResultset(rs);
     			this.closeStatement(st);
     			this.closeConnection();
+    		}
     /*
     		ResultSet rs = null;
     		PreparedStatement st = null;
     		this.getConnection();
     		try {
     			st = connection.prepareStatement(command);
     			int pos = 1;
     			for (Object v : values) {
     				st.setObject(pos, v);
     				pos++;
+    			}
     			try {
     				st.execute();
     				try {
     					rs = st.getResultSet();
     					CachedRowSetImpl rowset = new CachedRowSetImpl();
     					rowset.populate(rs);
     					return rowset;
     				} finally {
     					try {
     						rs.close();
     					} catch (SQLException e) {
     						log.error("Cannot close result set", e);
+    					}
+    				}
     			} finally {
     				try {
     					st.close();
     				} catch (SQLException e) {
     					log.error("Fail to execute command " + st.getWarnings());
     					log.error("Cannot close statement", e);
+    				}
+    			}
     		} finally {
     			try {
     				log.debug("Closing Connection...");
     				this.closeConnection();
     			} catch (SQLException e) {
     				log.error("Cannot close connection", e);
+    			}
+    		}
     */
+    	}
     	/**
-...
     	 */
     	public void executeUpdate(String command) throws SQLException {
     		log.debug("  Executing   Query ..." + command);
     		Statement st = null;
     		try{
     			this.getConnection();
      			Statement st = connection.createStatement();
      			st = connection.createStatement();
     			st.executeUpdate(command);
     			//st.close();
     		} finally {
     			this.closeStatement(st);
     			this.closeConnection();
+    		}
+    	}
-...
     	 */
     	public boolean executeUpdate(String command, ArrayList<Object> values) throws SQLException {
     		log.debug("  Executing   Query ..." + command);
     		log.debug("  Executing   Query ..." + command);
     		PreparedStatement st = null;
     		try{
     			this.getConnection();
     			PreparedStatement st = connection.prepareStatement(command);
     			st = connection.prepareStatement(command);
     			int pos = 1;
-...
+    			}
     			return !executed;
     		} finally {
     			this.closeStatement(st);
     			this.closeConnection();
+    		}
+    	}

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 53197

Added by Konstantina Galouni over 5 years ago