From ace18dfa1fc04f15a4f93f861f9f21effc5f988e Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 17 Mar 2012 12:10:09 +0100
Subject: [PATCH] * Prevent race condition. (cherry picked from commit
 ebbedb2b991f1f02b862b91af14ad6eaa9574c70)

---
 .../database/databasecommand_resolve.cpp          |  6 ++++--
 src/libtomahawk/result.cpp                        | 15 ++++++++-------
 src/libtomahawk/result.h                          |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/libtomahawk/database/databasecommand_resolve.cpp b/src/libtomahawk/database/databasecommand_resolve.cpp
index 354208105..9d0e4199c 100644
--- a/src/libtomahawk/database/databasecommand_resolve.cpp
+++ b/src/libtomahawk/database/databasecommand_resolve.cpp
@@ -143,8 +143,9 @@ DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
             url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
         }
 
+        bool cached = Tomahawk::Result::isCached( url );
         Tomahawk::result_ptr result = Tomahawk::Result::get( url );
-        if ( result->isValid() )
+        if ( cached )
         {
             qDebug() << "Result already cached:" << result->toString();
             res << result;
@@ -281,8 +282,9 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
             url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
         }
 
+        bool cached = Tomahawk::Result::isCached( url );
         Tomahawk::result_ptr result = Tomahawk::Result::get( url );
-        if ( result->isValid() )
+        if ( cached )
         {
             qDebug() << "Result already cached:" << result->toString();
             res << result;
diff --git a/src/libtomahawk/result.cpp b/src/libtomahawk/result.cpp
index 2e00e8953..8c53a45c4 100644
--- a/src/libtomahawk/result.cpp
+++ b/src/libtomahawk/result.cpp
@@ -50,6 +50,14 @@ Result::get( const QString& url )
 }
 
 
+bool
+Result::isCached( const QString& url )
+{
+    QMutexLocker lock( &s_mutex );
+    return ( s_results.contains( url ) );
+}
+
+
 Result::Result( const QString& url )
     : QObject()
     , m_url( url )
@@ -86,13 +94,6 @@ Result::deleteLater()
 }
 
 
-bool
-Result::isValid() const
-{
-    return !m_rid.isEmpty();
-}
-
-
 artist_ptr
 Result::artist() const
 {
diff --git a/src/libtomahawk/result.h b/src/libtomahawk/result.h
index 95bafcd74..72f3f3825 100644
--- a/src/libtomahawk/result.h
+++ b/src/libtomahawk/result.h
@@ -56,9 +56,9 @@ friend class ::DatabaseCommand_LoadFile;
 
 public:
     static Tomahawk::result_ptr get( const QString& url );
+    static bool isCached( const QString& url );
     virtual ~Result();
 
-    bool isValid() const;
     QVariant toVariant() const;
     QString toString() const;
     Tomahawk::query_ptr toQuery();