[Babeldoc-devel] babeldoc/modules/sql/src/com/babeldoc/sql/resource PooledJdbc.java,1.3,1.4

[<jon...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/resource
In directory sc8-pr-cvs1:/tmp/cvs-serv15057/src/com/babeldoc/sql/resource

Modified Files:
	PooledJdbc.java 
Log Message:
removed synchronization from checkOut() and checkIn() to eliminate deadlock when pool is exhausted.


Index: PooledJdbc.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/resource/PooledJdbc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PooledJdbc.java	27 Jun 2003 02:05:59 -0000	1.3
--- PooledJdbc.java	14 Jul 2003 17:02:36 -0000	1.4
***************
*** 109,113 ****
     * @throws ResourceException
     */
!   public synchronized void checkIn(Object connection) throws ResourceException {
      try {
        ((Connection) connection).close();
--- 109,113 ----
     * @throws ResourceException
     */
!   public void checkIn(Object connection) throws ResourceException {
      try {
        ((Connection) connection).close();
***************
*** 124,132 ****
     * @throws ResourceException
     */
!   public synchronized Object checkOut() throws ResourceException {
      try {
!       // if we have no dbUrl, setup jdbc NOW
!       if (dbUrl == null) {
!         setupJdbc();
        }
  
--- 124,134 ----
     * @throws ResourceException
     */
!   public Object checkOut() throws ResourceException {
      try {
!       synchronized(this) {
!         // if we have no dbUrl, setup jdbc NOW
!         if (dbUrl == null) {
!           setupJdbc();
!         }
        }