[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 06/11/13 15:20:21

  Modified:    src/main/org/jboss/seam  Component.java
  Log:
  minor
  
  Revision  Changes    Path
  1.208     +4 -6      jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.207
  retrieving revision 1.208
  diff -u -b -r1.207 -r1.208
  --- Component.java	13 Nov 2006 20:11:10 -0000	1.207
  +++ Component.java	13 Nov 2006 20:20:21 -0000	1.208
  @@ -120,7 +120,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.207 $
  + * @version $Revision: 1.208 $
    */
   @Scope(ScopeType.APPLICATION)
   @SuppressWarnings("deprecation")
  @@ -208,12 +208,14 @@
         beanClass = clazz;
         name = componentName;
         scope = componentScope;
  -      jndiName = componentJndiName;
         type = Seam.getComponentType(beanClass);
         interceptionType = Seam.getInterceptionType(beanClass);
         
         checkScopeForComponentType();
   
  +      jndiName = componentJndiName == null ? 
  +            getJndiName(applicationContext) : componentJndiName;
  +
         startup = beanClass.isAnnotationPresent(Startup.class);
         if (startup)
         {
  @@ -236,10 +238,6 @@
                  Synchronized.DEFAULT_TIMEOUT;
         }
         
  -      if (jndiName == null) {
  -          jndiName = getJndiName(applicationContext);
  -      }
  -
         log.info(
               "Component: " + getName() +
               ", scope: " + getScope() +