geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config Configuration.java ConfigurationManagerImpl.java
Date Thu, 10 Jun 2004 02:26:30 GMT
jboynes     2004/06/09 19:26:30

  Modified:    modules/kernel/src/java/org/apache/geronimo/kernel/config
                        Configuration.java ConfigurationManagerImpl.java
  Log:
  Allow for case where configs are never started
  Log exceptions thrown from doStop during shutdown
  
  Revision  Changes    Path
  1.25      +4 -1      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Configuration.java	5 Jun 2004 20:33:40 -0000	1.24
  +++ Configuration.java	10 Jun 2004 02:26:30 -0000	1.25
  @@ -196,6 +196,9 @@
   
       public void doStop() {
           log.info("Stopping configuration " + id);
  +        if (gbeans == null) {
  +            return;
  +        }
   
           // unregister all GBeans
           MBeanServer mbServer = kernel.getMBeanServer();
  
  
  
  1.9       +6 -2      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
  
  Index: ConfigurationManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConfigurationManagerImpl.java	5 Jun 2004 20:33:40 -0000	1.8
  +++ ConfigurationManagerImpl.java	10 Jun 2004 02:26:30 -0000	1.9
  @@ -221,10 +221,14 @@
                   if (kernel.isLoaded(configName)) {
                       try {
                           kernel.stopGBean(configName);
  -                        kernel.unloadGBean(configName);
                       } catch (InstanceNotFoundException e) {
                           // ignore
                       } catch (InvalidConfigException e) {
  +                        log.warn("Could not stop configuration: " + configName, e);
  +                    }
  +                    try {
  +                        kernel.unloadGBean(configName);
  +                    } catch (InstanceNotFoundException e) {
                           // ignore
                       }
                   }
  
  
  

Mime
View raw message