[freenet-cvs] r23416 - in trunk/plugins: Freetalk/WoT WoT

[x...@freenetproject.org]

Author: xor
Date: 2008-11-08 11:02:28 +0000 (Sat, 08 Nov 2008)
New Revision: 23416

Modified:
   trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java
   trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java
   trunk/plugins/WoT/IdentityInserter.java
Log:
Maybe fix plugin unloading.

Modified: trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java        2008-11-08 
10:41:17 UTC (rev 23415)
+++ trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java        2008-11-08 
11:02:28 UTC (rev 23416)
@@ -151,7 +151,11 @@
                try {
                        Logger.debug(this, "Waiting for the node to start 
up...");
                        Thread.sleep((long) (3*60*1000 * (0.5f + 
Math.random()))); /* Let the node start up */
-               } catch (InterruptedException e) { }
+               }
+               catch (InterruptedException e)
+               {
+                       mThread.interrupt();
+               }

                while(isRunning) {
                        Logger.debug(this, "Identity manager loop running...");
@@ -165,6 +169,7 @@
                        }
                        catch (InterruptedException e)
                        {
+                               mThread.interrupt();
                                Logger.debug(this, "Identity manager loop 
interrupted!");
                        }
                }

Modified: trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java 2008-11-08 10:41:17 UTC 
(rev 23415)
+++ trunk/plugins/Freetalk/WoT/FTMessageManagerWoT.java 2008-11-08 11:02:28 UTC 
(rev 23416)
@@ -65,7 +65,11 @@
                try {
                        Logger.debug(this, "Waiting for the node to start 
up...");
                        Thread.sleep((long) (3*60*1000 * (0.5f + 
Math.random()))); /* Let the node start up */
-               } catch (InterruptedException e) { }
+               }
+               catch (InterruptedException e)
+               {
+                       mThread.interrupt();
+               }

                while(isRunning) {
                        Logger.debug(this, "Message manager loop running...");
@@ -77,6 +81,7 @@
                        }
                        catch (InterruptedException e)
                        {
+                               mThread.interrupt();
                                Logger.debug(this, "Message manager loop 
interrupted!");
                        }
                }

Modified: trunk/plugins/WoT/IdentityInserter.java
===================================================================
--- trunk/plugins/WoT/IdentityInserter.java     2008-11-08 10:41:17 UTC (rev 
23415)
+++ trunk/plugins/WoT/IdentityInserter.java     2008-11-08 11:02:28 UTC (rev 
23416)
@@ -72,9 +72,13 @@
        public void run() {
                mThread = Thread.currentThread();

-               try{
+               try {
                        Thread.sleep((long) (3*60*1000 * (0.5f + 
Math.random()))); // Let the node start up
-               } catch (InterruptedException e){}
+               }
+               catch (InterruptedException e)
+               {
+                       mThread.interrupt();
+               }
                while(isRunning) {
                        Logger.debug(this, "IdentityInserter loop running...");
                        ObjectSet<OwnIdentity> identities = 
OwnIdentity.getAllOwnIdentities(db);
@@ -95,9 +99,13 @@
                        }
                        db.commit();
                        Logger.debug(this, "IdentityInserter loop finished...");
-                       try{
+                       try {
                                Thread.sleep((long) (THREAD_PERIOD * (0.5f + 
Math.random())));
-                       } catch (InterruptedException e){}
+                       }
+                       catch (InterruptedException e)
+                       {
+                               mThread.interrupt();
+                       }
                }
        }