Projects >> railo >>a109bc390ff8d04e5a1cdf286a0f1fa669c5b1e9

Chunk
Conflicting content 
	}
	

<<<<<<< HEAD
	public void closePreparedStatements(int maxDelete) {
=======
	/*public void closePreparedStatements(int maxDelete) throws SQLException {
>>>>>>> f42c28578fac4ac1143a1cd389074014c92acbf2
		Iterator> it = preparedStatements.entrySet().iterator();
		int count=0;
		while(it.hasNext()){
Solution content 
	}
	

	/*public void closePreparedStatements(int maxDelete) throws SQLException {
		Iterator> it = preparedStatements.entrySet().iterator();
		int count=0;
		while(it.hasNext()){
File
DatasourceConnectionImpl.java
Developer's decision
Version 2
Kind of conflict
Comment
Method signature
Chunk
Conflicting content 
	        }
	        else {
	        	// some driver do not support second argument
<<<<<<< HEAD
	        	PreparedStatement preStat = dc.getPreparedStatement(sql, createGeneratedKeys,allowToCachePreperadeStatement);
	        	closeStatement=false;
=======
	        	PreparedStatement preStat = ((DatasourceConnectionPro)dc).getPreparedStatement(sql, createGeneratedKeys,allowToCachePreperadeStatement);
	        	//closeStatement=false;
>>>>>>> f42c28578fac4ac1143a1cd389074014c92acbf2
	        	stat=preStat;
	            setAttributes(preStat,maxrow,fetchsize,timeout);
	            setItems(preStat,items);
Solution content 
	        }
	        else {
	        	// some driver do not support second argument
	        	PreparedStatement preStat = dc.getPreparedStatement(sql, createGeneratedKeys,allowToCachePreperadeStatement);
	        	//closeStatement=false;
	        	stat=preStat;
	            setAttributes(preStat,maxrow,fetchsize,timeout);
	            setItems(preStat,items);
File
QueryImpl.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable