[jboss-cvs] JBossAS SVN: r109276 - trunk/testsuite/src/main/org/jboss/test/classloader/leak/clstore.

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

Author: smarlow at redhat.com
Date: 2010-11-11 14:19:35 -0500 (Thu, 11 Nov 2010)
New Revision: 109276

Modified:
   trunk/testsuite/src/main/org/jboss/test/classloader/leak/clstore/ClassLoaderStore.java
Log:
JBAS-8613 for non-JVMTI case, try to avoid fillMemory and avoid timeout

Modified: trunk/testsuite/src/main/org/jboss/test/classloader/leak/clstore/ClassLoaderStore.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/leak/clstore/ClassLoaderStore.java	2010-11-11 18:01:36 UTC (rev 109275)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/leak/clstore/ClassLoaderStore.java	2010-11-11 19:19:35 UTC (rev 109276)
@@ -176,14 +176,17 @@
       else
       {
          log.debug("JVMTI not active; using System.gc()");
-         forceFullGCAndFinalize(null);
-         Thread.sleep(1000);
+         for (int looper = 0; looper < 5; looper++)
+         {
+            forceFullGCAndFinalize(null);
+            Thread.sleep(1000);
+         }
          
-         if (weakReferenceOnLoader.get() != null)
-            fillMemory(weakReferenceOnLoader, null);
+         //if (weakReferenceOnLoader.get() != null)
+         //   fillMemory(weakReferenceOnLoader, null);
          
-         if (weakReferenceOnLoader.get() != null)
-            fillMemory(weakReferenceOnLoader, null);
+         //if (weakReferenceOnLoader.get() != null)
+         //   fillMemory(weakReferenceOnLoader, null);
       }
       
       return (ClassLoader) weakReferenceOnLoader.get();
@@ -201,14 +204,14 @@
       else
       {
          // encourage a full gc
-         for(int looper =0; looper < 10; looper++)
+         for (int looper =0; looper < 10; looper++)
          {
            System.gc();
          }
 
       }
       // give more hints for gc + finalizers to run
-      for(int looper =0; looper < 10; looper++)
+      for (int looper =0; looper < 10; looper++)
       {
         System.gc();
         System.runFinalization();