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/system/src/java/org/apache/geronimo/system/main Daemon.java
Date Fri, 04 Jun 2004 17:38:45 GMT
jboynes     2004/06/04 10:38:45

  Modified:    modules/system/src/java/org/apache/geronimo/system/main
                        Daemon.java
  Log:
  Allow for boot configs that do not contain a persistent list
  
  Revision  Changes    Path
  1.6       +10 -8     incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
  
  Index: Daemon.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Daemon.java	4 Jun 2004 17:27:00 -0000	1.5
  +++ Daemon.java	4 Jun 2004 17:38:45 -0000	1.6
  @@ -123,13 +123,15 @@
   
               if (configs.isEmpty()) {
                   // nothing explicit, see what was running before
  -                try {
  -                    configs = (List) kernel.invoke(PersistentConfigurationList.OBJECT_NAME,
"restore");
  -                } catch (IOException e) {
  -                    System.err.println("Unable to restore last known configurations");
  -                    e.printStackTrace();
  -                    kernel.shutdown();
  -                    System.exit(3);
  +                if (kernel.isLoaded(PersistentConfigurationList.OBJECT_NAME)) {
  +                    try {
  +                        configs = (List) kernel.invoke(PersistentConfigurationList.OBJECT_NAME,
"restore");
  +                    } catch (IOException e) {
  +                        System.err.println("Unable to restore last known configurations");
  +                        e.printStackTrace();
  +                        kernel.shutdown();
  +                        System.exit(3);
  +                    }
                   }
               }
   
  
  
  

Mime
View raw message