--- glassfishV2/trunk/SRC/glassfish/appserv-core/src/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java	(revision 2402)
+++ glassfishV2/trunk/SRC/glassfish/appserv-core/src/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java	(revision 2403)
@@ -279,20 +279,32 @@
             for (int i=0; i<count; i++) {
                 instances.add(factory.create(null));
             }
-    	} catch (Exception ex) {
+        } catch (Exception ex) {
             //Need not throw this exception up since we are pre-populating
-    	}
+        }
 
         int sz = instances.size();
         if (sz == 0) {
             return;
         }
-    	synchronized (list) {
-            for (int i=0; i<sz; i++) {
-                list.add(instances.get(i));
+        synchronized (list) {
+            // check current pool size & adjust add size
+            int currsize = list.size();
+            int addsz = sz;
+            if(currsize + sz > maxPoolSize){
+                addsz = maxPoolSize - currsize;
+            }
+            
+            for (int i=0; i<addsz; i++) {
+                list.add(instances.remove(0));
             }
             createdCount += sz;
-    	}
+        }
+        
+        // destroys unnecessary instances
+        for(Object o : instances){
+            destroyObject(o);
+        }
     }
 
     /**