[jboss-cvs] JBossAS SVN: r109282 - 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 17:22:16 -0500 (Thu, 11 Nov 2010)
New Revision: 109282

Modified:
   trunk/testsuite/src/main/org/jboss/test/classloader/leak/clstore/ClassLoaderStore.java
Log:
JBAS-8613 revert back to forcing OOM

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 20:57:33 UTC (rev 109281)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/leak/clstore/ClassLoaderStore.java	2010-11-11 22:22:16 UTC (rev 109282)
@@ -128,9 +128,10 @@
          }
          
          fillMemory(weakReferenceOnLoader, leakAnalyzer);
-         
+
          if (weakReferenceOnLoader.get() == null)
          {
+            log.debug("leakAnalyzer.forceGC() released CL ref");
             return null;
          }
          
@@ -176,17 +177,12 @@
       else
       {
          log.debug("JVMTI not active; using System.gc()");
-         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();
@@ -204,19 +200,13 @@
       else
       {
          // encourage a full gc
-         for (int looper =0; looper < 10; looper++)
+         for (int looper =0; looper < 5; looper++)
          {
            System.gc();
          }
 
       }
-      // give more hints for gc + finalizers to run
-      for (int looper =0; looper < 10; looper++)
-      {
-        System.gc();
-        System.runFinalization();
-      }
-
+     System.runFinalization();
    }
     
    private void fillMemory(WeakReference<ClassLoader> ref, LeakAnalyzer leakAnalyzer)