[jboss-dev] Patch for JBAS-5471
Hi Scott/Carlo,
Re: http://jira.jboss.com/jira/browse/JBAS-5471
I've fixed this applying the changes in the attached patch. Explanation
of the resolution can be found in the comments I made in the JIRA. As I
hardly know this area, could you please review it?
Cheers,
--
Galder Zamarreño
Sr. Software Maintenance Engineer
JBoss, a division of Red Hat
Index:
/home/galder/jboss/code/as/trunk.ejbthree-1015/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
---
/home/galder/jboss/code/as/trunk.ejbthree-1015/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java (revision
72518)
+++
/home/galder/jboss/code/as/trunk.ejbthree-1015/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java (working
copy)
@@ -28,10 +28,10 @@
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.DeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.MCKernelAbstraction;
import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
import org.jboss.kernel.Kernel;
+import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
/**
@@ -39,6 +39,7 @@
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
* @author adrian(a)jboss.org
+ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder
Zamarreno</a>
* @version $Revision: 56592 $
*/
public class Ejb3JBoss5Deployment extends Ejb3Deployment
@@ -43,6 +44,8 @@
*/
public class Ejb3JBoss5Deployment extends Ejb3Deployment
{
+ private static final Logger log = Logger.getLogger(Ejb3JBoss5Deployment.class);
+
private org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit;
public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer
mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, DeploymentScope
deploymentScope, JBossMetaData metaData, PersistenceUnitsMetaData
persistenceUnitsMetaData)
@@ -51,7 +54,13 @@
this.jbossUnit = jbossUnit;
kernelAbstraction = new JBossASKernel(kernel);
- // todo maybe mbeanServer should be injected?
+ // inject mbean server
+ if (log.isTraceEnabled())
+ {
+ log.trace("Inject mbean server in kernel abstraction.");
+ }
+ kernelAbstraction.setMbeanServer(mbeanServer);
+
this.mbeanServer = mbeanServer;
}
Index:
/home/galder/jboss/code/as/trunk.ejbthree-1015/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
===================================================================
---
/home/galder/jboss/code/as/trunk.ejbthree-1015/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java (revision
72518)
+++
/home/galder/jboss/code/as/trunk.ejbthree-1015/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java (working
copy)
@@ -34,7 +34,6 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import javax.management.RuntimeMBeanException;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
@@ -40,7 +39,6 @@
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
@@ -59,6 +57,7 @@
* The JBossAS implementation of the ejb3 KernelAbstraction integration api
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
* @author Scott.Stark(a)jboss.org
+ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder
Zamarreno</a>
* @version $Revision:$
*/
public class JBossASKernel
@@ -137,7 +136,6 @@
try
{
mbeanServer.registerMBean(service, on);
- install(on.getCanonicalName(), dependencies, null, service);
// EJBTHREE-606: emulate the ServiceController calls
MBeanInfo info = mbeanServer.getMBeanInfo(on); // redundant call for speed