svn commit: r1365683 - /shiro/branches/1.2.x/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java

[lh...@apache.org]

Author: lhazlewood
Date: Wed Jul 25 18:15:11 2012
New Revision: 1365683

URL: http://svn.apache.org/viewvc?rev=1365683&view=rev
Log:
SHIRO-377: Applied patch.

Modified:
    shiro/branches/1.2.x/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java

Modified: shiro/branches/1.2.x/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java?rev=1365683&r1=1365682&r2=1365683&view=diff
==============================================================================
--- shiro/branches/1.2.x/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java (original)
+++ shiro/branches/1.2.x/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java Wed Jul 25 18:15:11 2012
@@ -34,7 +34,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-
 /**
  * A {@link TextConfigurationRealm} that defers all logic to the parent class, but just enables
  * {@link java.util.Properties Properties} based configuration in addition to the parent class's String configuration.
@@ -168,6 +167,9 @@ public class PropertiesRealm extends Tex
         }
     }
 
+    /**
+     * Destroy reload scheduler if one exists.
+     */
     public void destroy() {
         try {
             if (scheduler != null) {
@@ -177,6 +179,8 @@ public class PropertiesRealm extends Tex
             if (log.isInfoEnabled()) {
                 log.info("Unable to cleanly shutdown Scheduler.  Ignoring (shutting down)...", e);
             }
+        } finally {
+            scheduler = null;
         }
     }