[jboss-cvs] JBossAS SVN: r80306 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple.

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

Author: wolfc
Date: 2008-10-31 04:53:08 -0400 (Fri, 31 Oct 2008)
New Revision: 80306

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
Log:
EJBTHREE-1549: moved the callback outside of the passivation loop

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	2008-10-31 08:42:01 UTC (rev 80305)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java	2008-10-31 08:53:08 UTC (rev 80306)
@@ -284,9 +284,6 @@
                         assert removed == centry : "Removed " + removed
                               + " from internal cacheMap did not match the object we were expecting: " + centry;
 
-                        // Make internal callback that we're done
-                        this.passivationCompleted();
-                        
                         /*
                          * End EJBTHREE-1549
                          */
@@ -298,6 +295,8 @@
                            + Math.max(0, now - centry.lastUsed) + " ms");
                   }
                }
+               // Make internal callback that we're done
+               this.passivationCompleted();
             }
 
             catch (Exception ex)