Index: ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java
===================================================================
--- ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java	(revision 32009)
+++ ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java	(working copy)
@@ -638,10 +638,11 @@
                 if (addedIdleBeanWork == true) {
                     return;
                 }
+                addedIdleBeanWork = true;
                 IdleBeanWork work = new IdleBeanWork();
                 EjbContainerUtilImpl.getInstance().addWork(work);
-                addedIdleBeanWork = true;
             } catch (Exception ex) {
+                addedIdleBeanWork = false;
                 _logger.log(Level.WARNING, 
                             "[Pool-"+poolName+"]: Cannot perform "
                             + " pool idle bean cleanup", ex);