[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool ShutdownHook.java,1.8,1.9

[<bil...@us...>]

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1:/tmp/cvs-serv14448/src/java/org/logicalcobwebs/proxool

Modified Files:
	ShutdownHook.java 
Log Message:
Fixed typos and silently ignore IllegalStateException during shutdownHook removal (it's probably because
the JVM is shutting down).

Index: ShutdownHook.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ShutdownHook.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ShutdownHook.java	7 Sep 2003 22:05:15 -0000	1.8
--- ShutdownHook.java	27 Oct 2003 12:32:06 -0000	1.9
***************
*** 45,53 ****
              LOG.warn("Proxool will have to be shutdown manually with ProxoolFacade.shutdown() because this version of the JDK does not support Runtime.getRuntime().addShutdownHook()");
          } catch (SecurityException e) {
!             LOG.error("Probelm registering sutdownHook", e);
          } catch (IllegalAccessException e) {
!             LOG.error("Probelm registering sutdownHook", e);
          } catch (InvocationTargetException e) {
!             LOG.error("Probelm registering sutdownHook", e);
          }
      }
--- 45,58 ----
              LOG.warn("Proxool will have to be shutdown manually with ProxoolFacade.shutdown() because this version of the JDK does not support Runtime.getRuntime().addShutdownHook()");
          } catch (SecurityException e) {
!             LOG.error("Problem removing shutdownHook", e);
          } catch (IllegalAccessException e) {
!             LOG.error("Problem removing shutdownHook", e);
          } catch (InvocationTargetException e) {
!             if (e.getCause() instanceof IllegalStateException) {
!                 // This is probably because a shutdown is in progress. We can
!                 // safely ignore that.
!             } else {
!                 LOG.error("Problem removing shutdownHook", e);
!             }
          }
      }
***************
*** 70,78 ****
              LOG.warn("Proxool will have to be shutdown manually with ProxoolFacade.shutdown() because this version of the JDK does not support Runtime.getRuntime().addShutdownHook()");
          } catch (SecurityException e) {
!             LOG.error("Probelm registering sutdownHook", e);
          } catch (IllegalAccessException e) {
!             LOG.error("Probelm registering sutdownHook", e);
          } catch (InvocationTargetException e) {
!             LOG.error("Probelm registering sutdownHook", e);
          }
      }
--- 75,83 ----
              LOG.warn("Proxool will have to be shutdown manually with ProxoolFacade.shutdown() because this version of the JDK does not support Runtime.getRuntime().addShutdownHook()");
          } catch (SecurityException e) {
!             LOG.error("Problem registering shutdownHook", e);
          } catch (IllegalAccessException e) {
!             LOG.error("Problem registering shutdownHook", e);
          } catch (InvocationTargetException e) {
!             LOG.error("Problem registering shutdownHook", e);
          }
      }
***************
*** 94,97 ****
--- 99,106 ----
   Revision history:
   $Log$
+  Revision 1.9  2003/10/27 12:32:06  billhorsman
+  Fixed typos and silently ignore IllegalStateException during shutdownHook removal (it's probably because
+  the JVM is shutting down).
+ 
   Revision 1.8  2003/09/07 22:05:15  billhorsman
   Now uses reflection to add ShutdownHook to Runtime so that it is JDK independent. Using JDK1.2