cvs commit: jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/pool DefaultPool.java

[bloritsch]

bloritsch    01/12/11 08:14:32

  Modified:    src/java/org/apache/avalon/excalibur/monitor
                        ActiveMonitor.java
               src/java/org/apache/avalon/excalibur/pool DefaultPool.java
  Log:
  Apply patch from Marcus Crafter
  
  Revision  Changes    Path
  1.4       +2 -2      
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java
  
  Index: ActiveMonitor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ActiveMonitor.java        2001/12/11 09:53:30     1.3
  +++ ActiveMonitor.java        2001/12/11 16:14:31     1.4
  @@ -32,13 +32,13 @@
    *     <init-resources>
    *       <-- This entry can be repeated for every resource you want to 
register immediately -->
    *
  - *       &lt;resource key="<i>file:./myfile.html</i>" 
class="<i>org.apache.avalon.excalibur.monitor.FileMonitor</i>"/&gt;
  + *       &lt;resource key="<i>file:./myfile.html</i>" 
class="<i>org.apache.avalon.excalibur.monitor.FileResource</i>"/&gt;
    *     &lt;/init-resources&gt;
    *   &lt;/monitor&gt;
    * </pre>
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  - * @version $Id: ActiveMonitor.java,v 1.3 2001/12/11 09:53:30 jefft Exp $
  + * @version $Id: ActiveMonitor.java,v 1.4 2001/12/11 16:14:31 bloritsch Exp $
    */
   public final class ActiveMonitor extends AbstractLoggable
       implements Monitor, Component, Startable, ThreadSafe, Configurable, 
Runnable
  
  
  
  1.8       +2 -2      
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/pool/DefaultPool.java
  
  Index: DefaultPool.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/pool/DefaultPool.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultPool.java  2001/12/11 09:53:31     1.7
  +++ DefaultPool.java  2001/12/11 16:14:31     1.8
  @@ -16,7 +16,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/12/11 09:53:31 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/12/11 16:14:31 $
    * @since 4.0
    */
   public class DefaultPool
  @@ -183,7 +183,7 @@
               {
                   m_ready.add(obj);
   
  -                if( (this.size() >= m_max) && (this instanceof Resizable) )
  +                if( (this.size() > m_max) && (this instanceof Resizable) )
                   {
                       this.internalShrink( m_controller.shrink() );
                   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>