[jboss-cvs] jboss/src/main/org/jboss/ejb Container.java

[Adrian B. <ej...@us...>]

  User: ejort   
  Date: 03/05/08 05:02:29

  Modified:    src/main/org/jboss/ejb Tag: Branch_3_2 Container.java
  Log:
  Refactor the jmx container name rules for use by jsr77
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.96.2.12 +2 -3      jboss/src/main/org/jboss/ejb/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v
  retrieving revision 1.96.2.11
  retrieving revision 1.96.2.12
  diff -u -r1.96.2.11 -r1.96.2.12
  --- Container.java	4 Apr 2003 22:29:01 -0000	1.96.2.11
  +++ Container.java	8 May 2003 12:02:29 -0000	1.96.2.12
  @@ -65,7 +65,7 @@
    * @author <a href="mailto:Sco...@jb...">Scott Stark</a>.
    * @author <a href="bi...@bu...">Bill Burke</a>
    * @author <a href="mailto:d_j...@us...">David Jencks</a>
  - * @version $Revision: 1.96.2.11 $
  + * @version $Revision: 1.96.2.12 $
    *
    * @jmx:mbean extends="org.jboss.system.ServiceMBean"
    */
  @@ -499,8 +499,7 @@
      public ObjectName getJmxName()
      {
         BeanMetaData beanMetaData = getBeanMetaData();
  -      String jndiName = beanMetaData.getHome() != null ?
  -         beanMetaData.getJndiName() : beanMetaData.getLocalJndiName();
  +      String jndiName = beanMetaData.getContainerObjectNameJndiName();
         if (jndiName == null)
         {
            throw new IllegalStateException("Container jndiName is null");