You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ke...@apache.org on 2010/07/10 00:46:27 UTC
svn commit: r962717 -
/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
Author: kevan
Date: Fri Jul 9 22:46:27 2010
New Revision: 962717
URL: http://svn.apache.org/viewvc?rev=962717&view=rev
Log:
fix merge error
Modified:
openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=962717&r1=962716&r2=962717&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java Fri Jul 9 22:46:27 2010
@@ -936,7 +936,7 @@ public class Pool<T> {
}
@Managed
- private long getAvailable() {
+ private int getAvailablePermits() {
return available.availablePermits();
}