[jboss-cvs] JBossAS SVN: r86610 - projects/jboss-threads/trunk/jbossmc/src/main/java/org/jboss/threads/metadata.

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

Author: david.lloyd at jboss.com
Date: 2009-04-01 15:39:59 -0400 (Wed, 01 Apr 2009)
New Revision: 86610

Modified:
   projects/jboss-threads/trunk/jbossmc/src/main/java/org/jboss/threads/metadata/ThreadsMetaData.java
Log:
Fix JMX problems (JBTHR-7)

Modified: projects/jboss-threads/trunk/jbossmc/src/main/java/org/jboss/threads/metadata/ThreadsMetaData.java
===================================================================
--- projects/jboss-threads/trunk/jbossmc/src/main/java/org/jboss/threads/metadata/ThreadsMetaData.java	2009-04-01 18:05:32 UTC (rev 86609)
+++ projects/jboss-threads/trunk/jbossmc/src/main/java/org/jboss/threads/metadata/ThreadsMetaData.java	2009-04-01 19:39:59 UTC (rev 86610)
@@ -53,9 +53,9 @@
 import org.jboss.threads.ArrayQueue;
 import org.jboss.threads.JBossThreadPoolExecutor;
 import org.jboss.threads.DirectExecutor;
+import org.jboss.threads.ThreadPoolExecutorMBean;
 import org.jboss.dependency.spi.ControllerMode;
 import org.jboss.aop.microcontainer.aspects.jmx.JMX;
-import org.jboss.util.threadpool.ThreadPoolMBean;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlNsForm;
@@ -267,6 +267,9 @@
                 }
             }
             final String threadFactory = metaData.getThreadFactory();
+            if (threadFactory == null) {
+                throw new IllegalArgumentException("threadFactory is not defined");
+            }
             final Integer queueLength = metaData.getQueueLength();
             final RejectPolicyMetaData rejectPolicyMetaData = metaData.getRejectPolicyMetaData();
             final String policyName = rejectPolicyMetaData == null ? "block" : rejectPolicyMetaData.getName();
@@ -358,15 +361,15 @@
             }
             executorBuilder.addAnnotation(new JMX() {
                 public Class<?> exposedInterface() {
-                    return ThreadPoolMBean.class;
+                    return ThreadPoolExecutorMBean.class;
                 }
 
                 public String name() {
-                    return "org.jboss.threads:service=ThreadPool,name=" + name;
+                    return "jboss.threads:service=ThreadPoolExecutor,name=" + name;
                 }
 
                 public boolean registerDirectly() {
-                    return true;
+                    return false;
                 }
 
                 public Class<? extends Annotation> annotationType() {