Author: dblevins
Date: Tue Sep 14 01:46:20 2010
New Revision: 996732
URL: http://svn.apache.org/viewvc?rev=996732&view=rev
Log:
merged http://svn.apache.org/viewvc?rev=996656&view=rev
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=996732&r1=996731&r2=996732&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
Tue Sep 14 01:46:20 2010
@@ -947,7 +947,12 @@ public class Pool<T> {
@Managed
private int getInstancesIdle() {
- return getInstancesPooled() - getInstancesActive();
+ return Math.max(0, getInstancesPooled() - getInstancesActive());
+ }
+
+ @Managed
+ private int getInstancesInitializing() {
+ return Math.max(0, getInstancesActive() - getInstancesPooled());
}
@Managed
