From b301ac1aea90194835452074c85c263a5338da39 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Mon, 25 Feb 2008 20:57:12 +0000
Subject: [PATCH] 1. Recreate broken contact list files so we can store
 changes. 2. Continue listening for metacontact list changes even on exception
 when parsing.

---
 .../impl/contactlist/MclStorageManager.java   | 56 +++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
index 434827ef9..ed544b437 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
@@ -557,28 +557,46 @@ void extractContactsForAccount(String accountID)
     {
         if(!isStarted())
             return;
+        
+        //we don't want to receive meta contact events triggerred by ourselves
+        //so we stop listening. it is possible but very unlikely that other
+        //events, not triggerred by us are received while we're off the channel
+        //but that would be a very bizzare case ..... I guess we got to live
+        //with the risk.
+        this.mclServiceImpl.removeMetaContactListListener(this);
+        
         try
         {
-            //we don't want to receive meta contact events triggerred by ourselves
-            //so we stop listening. it is possible but very unlikely that other
-            //events, not triggerred by us are received while we're off the channel
-            //but that would be a very bizzare case ..... I guess we got to live
-            //with the risk.
-            this.mclServiceImpl.removeMetaContactListListener(this);
-
             Element root = findMetaContactGroupNode(
                 mclServiceImpl.getRoot().getMetaUID());
 
-            //parse the group node and extract all its child groups and contacts
-            processGroupXmlNode(mclServiceImpl, accountID, root
-                                , null, null);
-
-            //now save the contact list in case it has changed
-            scheduleContactListStorage();
+            if(root == null)
+            {
+                // If there is no root, there is definitely something wrong
+                // really broken file will create it again
+                logger.fatal("The contactlist file is recreated cause its broken");
+                
+                DocumentBuilderFactory factory =
+                    DocumentBuilderFactory.newInstance();
+                DocumentBuilder builder = factory.newDocumentBuilder();
+                contactListDocument = builder.newDocument();
+                
+                initVirginDocument(mclServiceImpl, contactListDocument);
 
-            //now that we're done updating the contact list we can start listening
-            //again
-            this.mclServiceImpl.addMetaContactListListener(this);
+                //write the contact list so that it is there for the parser
+                storeContactList0();
+            }
+            else
+            {
+                // if there is root lets parse it
+                //parse the group node and extract all its child groups and contacts
+                processGroupXmlNode(mclServiceImpl, accountID, root
+                                , null, null);
+                
+                //now save the contact list in case it has changed
+                scheduleContactListStorage();
+            }
+             
         }catch(Throwable exc)
         {
             // catch everything because we MUST NOT disturb the thread
@@ -587,6 +605,12 @@ void extractContactsForAccount(String accountID)
             throw new XMLException("Failed to extract contacts for account "
                                    +accountID, exc);
         }
+        finally
+        {
+            //now that we're done updating the contact list we can start listening
+            //again
+            this.mclServiceImpl.addMetaContactListListener(this);
+        }
     }
 
     /**