Fixes issues with the async queries of the contact list which may cause

missing contacts.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java
index 4286a15..b653b95 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java
@@ -135,6 +135,24 @@ public class GoogleContactsQuery
                 });
     }
 
+    @Override
+    public synchronized void start()
+    {
+        boolean hasStarted = false;
+
+        try
+        {
+            super.start();
+            hasStarted = true;
+        }
+        finally
+        {
+            if (!hasStarted)
+            {
+                getContactSource().removeQuery(this);
+            }
+        }
+    }
     /**
      * Gets the <tt>contactDetails</tt> to be set on a <tt>SourceContact</tt>.
      *