[jBoss-Dev] CVS update: jboss/src/main/org/jboss/minerva/poolsObjectPool.java

[jBoss CVS Development]

  User: oleg    
  Date: 00/10/03 04:33:12

  Modified:    src/main/org/jboss/minerva/pools ObjectPool.java
  Log:
  After unsuccessful login or any other SQL error in the underlying DataSource/driver 
during getConnection() an invalid ObjectRecord was put to the pool
  
  Revision  Changes    Path
  1.10      +2 -0      jboss/src/main/org/jboss/minerva/pools/ObjectPool.java
  
  Index: ObjectPool.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/minerva/pools/ObjectPool.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ObjectPool.java   2000/10/02 17:24:07     1.9
  +++ ObjectPool.java   2000/10/03 11:33:12     1.10
  @@ -28,7 +28,7 @@
    *   <LI>Shut it down</LI>
    * </OL>
    * @see org.jboss.minerva.pools.PooledObject
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class ObjectPool implements PoolEventListener {
  @@ -543,6 +543,8 @@
               synchronized(objects) {  // Don't let 2 threads add at the same time
                   if(maxSize == 0 || objects.size() < maxSize) {
                       Object ob = factory.createObject();
  +                    if (ob == null) // failure: factory cannot create object
  +                        return null;
                       ObjectRecord rec = new ObjectRecord(ob);
                       objects.put(ob, rec);
                       result = factory.prepareObject(ob);