User: docodan 
  Date: 01/06/03 12:28:36

  Modified:    src/main/org/jboss/ejb Container.java
  Log:
  Fixed null pointer bug.
  
  Revision  Changes    Path
  1.41      +6 -5      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Container.java    2001/06/03 18:48:12     1.40
  +++ Container.java    2001/06/03 19:28:36     1.41
  @@ -69,7 +69,7 @@
    *   @see ContainerFactory
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.40 $
  + *   @version $Revision: 1.41 $
    */
   public abstract class Container
   {
  @@ -315,14 +315,15 @@
         // Acquire classes from CL
         beanClass = classLoader.loadClass(metaData.getEjbClass());
   
  -      if (metaData.getHome() != null)
  +      if (metaData.getLocalHome() != null)
            localHomeInterface = classLoader.loadClass(metaData.getLocalHome());
  -      if (metaData.getRemote() != null)
  +      if (metaData.getLocal() != null)
            localInterface = classLoader.loadClass(metaData.getLocal());
         
         localContainerInvoker.setContainer( this );
         localContainerInvoker.init();
  -      application.addLocalHome(this, localContainerInvoker.getEJBLocalHome() );
  +      if (localHomeInterface != null)
  +         application.addLocalHome(this, localContainerInvoker.getEJBLocalHome() );
         // Setup "java:" namespace
         setupEnvironment();
      }
  @@ -486,7 +487,7 @@
                  }
               }
            }
  -
  +        
            // Bind resource references
            {
               Iterator enum = getBeanMetaData().getResourceReferences();
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to