cvs commit: incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas GeronimoLoginConfiguration.java

[jboynes]

jboynes     2004/05/30 12:44:06

  Modified:    modules/security/src/java/org/apache/geronimo/security/jaas
                        GeronimoLoginConfiguration.java
  Log:
  Set old config to null if a SecurityEx is thrown
  This happens if there is no prior config defined
  
  Revision  Changes    Path
  1.6       +6 -2      
incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
  
  Index: GeronimoLoginConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- GeronimoLoginConfiguration.java   30 May 2004 18:32:42 -0000      1.5
  +++ GeronimoLoginConfiguration.java   30 May 2004 19:44:05 -0000      1.6
  @@ -69,7 +69,11 @@
       }
   
       public void doStart() throws WaitingException, Exception {
  -        oldConfiguration = Configuration.getConfiguration();
  +        try {
  +            oldConfiguration = Configuration.getConfiguration();
  +        } catch (SecurityException e) {
  +            oldConfiguration = null;
  +        }
           Configuration.setConfiguration(this);
       }