comparison rdf/PluginRDFIndexer.cpp @ 476:acddcc3cca36

* Avoid deadlock in indexer

 }
 
 QString
 PluginRDFIndexer::getIdForPluginURI(QString uri)
 {
-    QMutexLocker locker(&m_mutex);
+    m_mutex.lock();
 
     if (m_uriToIdMap.find(uri) == m_uriToIdMap.end()) {
+
+        m_mutex.unlock();
 
         // Haven't found this uri referenced in any document on the
         // local filesystem; try resolving the pre-fragment part of
         // the uri as a document URL and reading that if possible.
 

 
         QString baseUrl = QUrl(uri).toString(QUrl::RemoveFragment);
 
         indexURL(baseUrl);
 
+        m_mutex.lock();
+
         if (m_uriToIdMap.find(uri) == m_uriToIdMap.end()) {
             m_uriToIdMap[uri] = "";
         }
     }
 
-    return m_uriToIdMap[uri];
+    QString id = m_uriToIdMap[uri];
+    m_mutex.unlock();
+    return id;
 }
 
 QString
 PluginRDFIndexer::getDescriptionURLForPluginId(QString pluginId)
 {