[jboss-cvs] JBossAS SVN: r89752 - in projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache: simple and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-06-03 13:28:46 -0400 (Wed, 03 Jun 2009)
New Revision: 89752

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/NoPassivationCache.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
[EJBTHREE-1843] EJB3 SFSB Caches must return the accurate availableCount

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/NoPassivationCache.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/NoPassivationCache.java	2009-06-03 17:19:07 UTC (rev 89751)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/NoPassivationCache.java	2009-06-03 17:28:46 UTC (rev 89752)
@@ -183,7 +183,14 @@
    
    public int getAvailableCount()
    {
-      return -1;
+      final int maxSize = this.getMaxSize();
+      if (maxSize < 0)
+      {
+         return maxSize;
+      }
+      final int currentSize = this.getCurrentSize();
+      final int available = maxSize - currentSize;
+      return available;
    }
    
    public int getMaxSize()

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java	2009-06-03 17:19:07 UTC (rev 89751)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java	2009-06-03 17:28:46 UTC (rev 89752)
@@ -583,7 +583,14 @@
    
    public int getAvailableCount()
    {
-      return -1;
+      final int maxSize = this.getMaxSize();
+      if (maxSize < 0)
+      {
+         return maxSize;
+      }
+      final int currentSize = this.getCurrentSize();
+      final int available = maxSize - currentSize;
+      return available;
    }
    
    public int getMaxSize()

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2009-06-03 17:19:07 UTC (rev 89751)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2009-06-03 17:28:46 UTC (rev 89752)
@@ -524,7 +524,14 @@
 
    public int getAvailableCount()
    {
-      return -1;
+      final int maxSize = this.getMaxSize();
+      if (maxSize < 0)
+      {
+         return maxSize;
+      }
+      final int currentSize = this.getCurrentSize();
+      final int available = maxSize - currentSize;
+      return available;
    }
 
    public int getMaxSize()