[freenet-cvs] r23412 - trunk/plugins/Freetalk

[x...@freenetproject.org]

Author: xor
Date: 2008-11-08 09:15:19 +0000 (Sat, 08 Nov 2008)
New Revision: 23412

Modified:
   trunk/plugins/Freetalk/FTMessageManager.java
   trunk/plugins/Freetalk/Freetalk.java
Log:
Fix NPE.

Modified: trunk/plugins/Freetalk/FTMessageManager.java
===================================================================
--- trunk/plugins/Freetalk/FTMessageManager.java        2008-11-08 09:11:47 UTC 
(rev 23411)
+++ trunk/plugins/Freetalk/FTMessageManager.java        2008-11-08 09:15:19 UTC 
(rev 23412)
@@ -31,6 +31,7 @@
                assert(myIdentityManager != null);

                db = myDB;
+               mExecutor = myExecutor;
                mIdentityManager = myIdentityManager;
                mExecutor.execute(this, "FT Identity Manager");
        }

Modified: trunk/plugins/Freetalk/Freetalk.java
===================================================================
--- trunk/plugins/Freetalk/Freetalk.java        2008-11-08 09:11:47 UTC (rev 
23411)
+++ trunk/plugins/Freetalk/Freetalk.java        2008-11-08 09:15:19 UTC (rev 
23412)
@@ -147,10 +147,24 @@
        }

        public void terminate() {
-               mMessageManager.terminate();
-               mIdentityManager.terminate();
-               db.commit();
-               db.close();
+               Logger.debug(this, "Terminating Freetalk ...");
+               
+               if(mMessageManager != null)
+                       mMessageManager.terminate();
+               else
+                       Logger.error(this, "Message manager was null!");
+               
+               if(mIdentityManager != null)
+                       mIdentityManager.terminate();
+               else
+                       Logger.error(this, "Identity manager was null!");
+               
+               if(db != null) {
+                       db.commit();
+                       db.close();
+               } else
+                       Logger.error(this, "Database was null!");
+               
                Logger.debug(this, "Freetalk plugin terminated.");
        }