[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool HouseKeeper.java,1.3,1.4

[<bil...@us...>]

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11905/src/java/org/logicalcobwebs/proxool

Modified Files:
	HouseKeeper.java 
Log Message:
Improve message when closing a connection that has been active for too long

Index: HouseKeeper.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/HouseKeeper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HouseKeeper.java	11 Sep 2003 23:57:48 -0000	1.3
--- HouseKeeper.java	2 Oct 2005 12:35:06 -0000	1.4
***************
*** 139,146 ****
                         connectionPool.removeProxyConnection(proxyConnection,
                                 "it has been active for too long", ConnectionPool.FORCE_EXPIRY, true);
! 
                         log.warn("#" + FormatHelper.formatMediumNumber(proxyConnection.getId()) + " was active for " + activeTime
                                 + " milliseconds and has been removed automaticaly. The Thread responsible was named '"
!                                + proxyConnection.getRequester() + "'.");
  
                     }
--- 139,153 ----
                         connectionPool.removeProxyConnection(proxyConnection,
                                 "it has been active for too long", ConnectionPool.FORCE_EXPIRY, true);
!                        String lastSqlCallMsg;
!                        if (proxyConnection.getLastSqlCall() != null) {
!                            lastSqlCallMsg = ", and the last SQL it performed is '" + proxyConnection.getLastSqlCall() + "'.";
!                        } else if (!proxyConnection.getDefinition().isTrace()) {
!                            lastSqlCallMsg = ", but the last SQL it performed is unknown because the trace property is not enabled.";
!                        } else {
!                            lastSqlCallMsg = ", but the last SQL it performed is unknown.";
!                        }
                         log.warn("#" + FormatHelper.formatMediumNumber(proxyConnection.getId()) + " was active for " + activeTime
                                 + " milliseconds and has been removed automaticaly. The Thread responsible was named '"
!                                + proxyConnection.getRequester() + "'" + lastSqlCallMsg);
  
                     }
***************
*** 253,256 ****
--- 260,266 ----
   Revision history:
   $Log$
+  Revision 1.4  2005/10/02 12:35:06  billhorsman
+  Improve message when closing a connection that has been active for too long
+ 
   Revision 1.3  2003/09/11 23:57:48  billhorsman
   Test SQL now traps Throwable, not just SQLException.