[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbContainerFactory.java

[jBoss CVS Development]

  User: fleury  
  Date: 00/05/28 15:18:09

  Modified:    src/main/org/jboss/ejb ContainerFactory.java
  Log:
  Setting the name of the configuration on the pools so that the beans know what their 
conf is...
  gets rid of a null pointer exception in deployment
  
  Revision  Changes    Path
  1.9       +15 -5     jboss/src/main/org/jboss/ejb/ContainerFactory.java
  
  Index: ContainerFactory.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ContainerFactory.java     2000/05/27 23:01:35     1.8
  +++ ContainerFactory.java     2000/05/28 22:18:09     1.9
  @@ -61,7 +61,7 @@
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.8 $
  + *   @version $Revision: 1.9 $
    */
   public class ContainerFactory
      implements ContainerFactoryMBean, MBeanRegistration
  @@ -167,7 +167,11 @@
                                          
                                         log.log("Using default configuration");
                                         
  +                                      // Get the container default configuration
                                         conf =  
jar.getContainerConfigurations().getContainerConfiguration("Default Stateless 
SessionBean");
  +                                      
  +                                      // Make sure this bean knows the 
configuration he is using
  +                                      bean.setConfigurationName("Default Stateless 
SessionBean");
                                  }
                                  
                     
con.setContainerInvoker((ContainerInvoker)cl.loadClass(conf.getContainerInvoker()).newInstance());
  @@ -201,17 +205,23 @@
                                  // Make sure we have a default configuration
                                  if (conf == null) {
                                          
  -                                      log.log("Using default configuration");
  -                                      if (((jBossEntity) 
bean).getPersistenceType().equalsIgnoreCase("bean")) {
  +                                       log.log("Using default configuration");
  +                                       if (((jBossEntity) 
bean).getPersistenceType().equalsIgnoreCase("bean")) {
                                                 
                                                 // BMP case
                                                 conf =  
jar.getContainerConfigurations().getContainerConfiguration("BMP EntityBean");
  -                                  }
  +                                  
  +                                              // Make sure this bean knows the 
configuration he is using
  +                                              bean.setConfigurationName("BMP 
EntityBean");
  +                                      }
                                         else { 
                                         
                                             // CMP case
                                                 conf =  
jar.getContainerConfigurations().getContainerConfiguration("CMP EntityBean");
  -                                  }
  +                                  
  +                                             // Make sure this bean knows the 
configuration he is using
  +                                             bean.setConfigurationName("CMP 
EntityBean");
  +                                      }
                                  }
                     
con.setContainerInvoker((ContainerInvoker)cl.loadClass(conf.getContainerInvoker()).newInstance());
                     
((EntityContainer)con).setInstanceCache((InstanceCache)cl.loadClass(conf.getInstanceCache()).newInstance());