commit b12d70e60bcee29aa811f57525d21a787d42501c
author Brian Demers <bdemers@apache.org> Sun Apr 30 22:08:59 2017 -0400
committer Brian Demers <bdemers@apache.org> Sun Apr 30 22:11:46 2017 -0400
tree d6ca08ae4b54a62c5353b868d7ffd8efbc2706a9
parent 66e6b96ee3e5ce675654ff70a4a58b623e6ba87e

SHIRO-559 Remove checked exception on @PreDestroy in ShiroModule

Required by Glassfish, possibly other containers per spec: https://docs.oracle.com/javaee/7/api/javax/annotation/PreDestroy.html

support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java

diff --git a/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java b/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
index 2eac73d..3abbe95 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
@@ -29,7 +29,6 @@
 

 import com.google.inject.Provider;

 import com.google.inject.matcher.Matchers;

-import com.google.inject.name.Names;

 import com.google.inject.spi.InjectionListener;

 import com.google.inject.spi.TypeEncounter;

 import com.google.inject.spi.TypeListener;

@@ -54,6 +53,8 @@
 import com.google.inject.binder.LinkedBindingBuilder;

 import com.google.inject.multibindings.Multibinder;

 import com.google.inject.util.Types;

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

 

 

 /**

@@ -63,6 +64,8 @@
  */

 public abstract class ShiroModule extends PrivateModule implements Destroyable {

 

+    private final Logger log = LoggerFactory.getLogger(ShiroModule.class);

+

 	private Set<Destroyable> destroyables = Collections.newSetFromMap(new WeakHashMap<Destroyable, Boolean>());

     public void configure() {

         // setup security manager

@@ -79,7 +82,7 @@
             }

 

             @PreDestroy

-            public void destroy() throws Exception {

+            public void destroy() {

                 ShiroModule.this.destroy();

             }

         };

@@ -184,9 +187,14 @@
      *

      * @throws Exception

      */

-    public final void destroy() throws Exception {

+    public final void destroy() {

         for (Destroyable destroyable : destroyables) {

-            destroyable.destroy();

+            try {

+                destroyable.destroy();

+            }

+            catch(Exception e) {

+                log.warn("Error destroying component class: " + destroyable.getClass(), e);

+            }

         }

     }