mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch to notify listeners on error from Csaba Nagy

Browse Source
This commit is contained in:
Dave Cramer 2003-03-25 02:46:23 +00:00
parent f1792b932c
commit 9e29b32e78
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/interfaces/jdbc/org/postgresql/jdbc2/optional/PooledConnectionImpl.java
View File

@ -13,7 +13,8 @@ import org.postgresql.PGConnection;
* @see ConnectionPool * @see ConnectionPool
* *
* @author Aaron Mulder (ammulder@chariotsolutions.com) * @author Aaron Mulder (ammulder@chariotsolutions.com)
* @version $Revision: 1.6 $ * @author Csaba Nagy (ncsaba@yahoo.com)
* @version $Revision: 1.7 $
*/ */
public class PooledConnectionImpl implements PooledConnection public class PooledConnectionImpl implements PooledConnection
{ {
@ -95,33 +96,47 @@ public class PooledConnectionImpl implements PooledConnection
{ {
if (con == null) if (con == null)
{ {
throw new SQLException("This PooledConnection has already been closed!"); // Before throwing the exception, let's notify the registered listeners about the error
final SQLException sqlException = new SQLException("This PooledConnection has already been closed!");
fireConnectionFatalError(sqlException);
throw sqlException;
} }
// Only one connection can be open at a time from this PooledConnection. See JDBC 2.0 Optional Package spec section 6.2.3 // If any error occures while opening a new connection, the listeners
if (last != null) // have to be notified. This gives a chance to connection pools to
// elliminate bad pooled connections.
try
{ {
last.close(); // Only one connection can be open at a time from this PooledConnection. See JDBC 2.0 Optional Package spec section 6.2.3
if (!con.getAutoCommit()) if (last != null)
{ {
try last.close();
if (!con.getAutoCommit())
{ {
con.rollback(); try
{
con.rollback();
}
catch (SQLException e)
{}
} }
catch (SQLException e) con.clearWarnings();
{}
} }
con.clearWarnings(); con.setAutoCommit(autoCommit);
}
catch (SQLException sqlException)
{
fireConnectionFatalError(sqlException);
throw (SQLException)sqlException.fillInStackTrace();
} }
con.setAutoCommit(autoCommit);
ConnectionHandler handler = new ConnectionHandler(con); ConnectionHandler handler = new ConnectionHandler(con);
last = handler; last = handler;
Connection con = (Connection)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Connection.class, PGConnection.class}, handler); Connection con = (Connection)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Connection.class, PGConnection.class}, handler);
last.setProxy(con); last.setProxy(con);
return con; return con;
} }
/** /**
* Used to fire a connection event to all listeners. * Used to fire a connection closed event to all listeners.
*/ */
void fireConnectionClosed() void fireConnectionClosed()
{ {
@ -140,7 +155,7 @@ public class PooledConnectionImpl implements PooledConnection
} }
/** /**
* Used to fire a connection event to all listeners. * Used to fire a connection error event to all listeners.
*/ */
void fireConnectionFatalError(SQLException e) void fireConnectionFatalError(SQLException e)
{ {
@ -363,7 +378,7 @@ public class PooledConnectionImpl implements PooledConnection
} }
else else
{ {
try try
{ {
return method.invoke(st, args); return method.invoke(st, args);
} }