[jboss-cvs] JBossAS SVN: r63208 - branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading.

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

Author: scott.stark at jboss.org
Date: 2007-05-25 10:53:07 -0400 (Fri, 25 May 2007)
New Revision: 63208

Modified:
   branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/ClassLoadingTask.java
   branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/LoadMgr3.java
Log:
JBPAPP-64, JBAS-4066 enforce a maximum bound on LinkageError/ClassCircularity errors

Modified: branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/ClassLoadingTask.java
===================================================================
--- branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/ClassLoadingTask.java	2007-05-25 04:50:36 UTC (rev 63207)
+++ branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/ClassLoadingTask.java	2007-05-25 14:53:07 UTC (rev 63208)
@@ -159,6 +159,12 @@
       this.trace = log.isTraceEnabled();
    }
 
+   synchronized int incNumCCE()
+   {
+      int cce = numCCE ++;
+      return cce;
+   }
+
    public String toString()
    {
       StringBuffer buffer = new StringBuffer(super.toString());

Modified: branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/LoadMgr3.java
===================================================================
--- branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/LoadMgr3.java	2007-05-25 04:50:36 UTC (rev 63207)
+++ branches/Branch_4_2/jmx/src/main/org/jboss/mx/loading/LoadMgr3.java	2007-05-25 14:53:07 UTC (rev 63208)
@@ -403,7 +403,8 @@
       {
          boolean retry = e instanceof ClassCircularityError
             || e.getClass().equals(LinkageError.class);
-         if( retry )
+         int numCCE = loadTask.incNumCCE();
+         if( retry && numCCE >= 10 )
          {
             /* Reschedule this task after all existing tasks to allow the
             current load tasks which are conflicting to complete.