[freenet-cvs] r21471 - branches/saltedhashstore/freenet/src/freenet/store/saltedhash

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-07-29 12:01:51 +0000 (Tue, 29 Jul 2008)
New Revision: 21471

Modified:
   
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
Log:
fix NPE on early shutdown

Modified: 
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
===================================================================
--- 
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
   2008-07-29 12:01:32 UTC (rev 21470)
+++ 
branches/saltedhashstore/freenet/src/freenet/store/saltedhash/SaltedHashFreenetStore.java
   2008-07-29 12:01:51 UTC (rev 21471)
@@ -894,12 +894,15 @@
                        super.run();

                        try {
-                               while (node.clientCore == null) {
+                               while (node.clientCore == null && !shutdown) {
                                        Thread.sleep(1000);
                                }       
                                Thread.sleep((int)(CLEANER_PERIOD / 2 + 
CLEANER_PERIOD * Math.random()));
                        } catch (InterruptedException e){}

+                       if (shutdown)
+                               return;
+                       
                        node.clientCore.alerts.register(new UserAlert() {
                                public String anchor() {
                                        return "store-cleaner-" + name;