[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kio/kfile
From:       Peter Penz <peter.penz19 () gmail ! com>
Date:       2010-11-07 13:18:50
Message-ID: 20101107131850.25261AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193878 by ppenz:

KFileMetaInfo is reentrant since the fixes from Sebastian Trüg for the 4.5.0 \
release.


 M  +0 -8      kloadfilemetadatathread.cpp  


--- trunk/KDE/kdelibs/kio/kfile/kloadfilemetadatathread.cpp #1193877:1193878
@@ -132,12 +132,6 @@
             if (variants.isEmpty()) {
                 // The file has not been indexed, query the meta data
                 // directly from the file
-
-                // TODO: KFileMetaInfo (or one of it's used components) is not \
                reentrant.
-                // As temporary workaround the access is protected by a mutex.
-                static QMutex metaInfoMutex;
-                metaInfoMutex.lock();
-
                 const QString path = urls.first().toLocalFile();
                 KFileMetaInfo metaInfo(path, QString(), KFileMetaInfo::Fastest);
                 const QHash<QString, KFileMetaInfoItem> metaInfoItems = \
metaInfo.items(); @@ -146,8 +140,6 @@
                     const Nepomuk::Variant value(metaInfoItem.value());
                     data.insert(uriString, \
Nepomuk::Utils::formatPropertyValue(Nepomuk::Types::Property(), value));  }
-
-                metaInfoMutex.unlock();
             }
         }
 


[prev in list] [next in list] [prev in thread] [next in thread]