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

[Gavin King]

  User: gavin   
  Date: 07/05/18 12:27:06

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  JBSEAM-1332, fix NPE on hot redeploy
  
  Revision  Changes    Path
  1.172     +7 -4      jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -b -r1.171 -r1.172
  --- Initialization.java	18 May 2007 06:44:03 -0000	1.171
  +++ Initialization.java	18 May 2007 16:27:06 -0000	1.172
  @@ -56,7 +56,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.171 $
  + * @version $Revision: 1.172 $
    */
   public class Initialization
   {
  @@ -510,11 +510,14 @@
         for ( String name: init.getHotDeployableComponents() )
         {
            Component component = Component.forName(name);
  +         if (component!=null)
  +         {
            ScopeType scope = component.getScope();
            if ( scope!=ScopeType.STATELESS && scope.isContextActive() )
            {
               scope.getContext().remove(name);
            }
  +         }
            Contexts.getApplicationContext().remove(name + ".component");
         }
         //TODO open the ability to reuse the classloader by looking at the components class classloaders