Ensure the initialization of the TypeIndex is threadsafe.

Multiple initial queries can be running at the same time.

3 files changed, 15 insertions, 0 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index a348e65..18009fc 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -21,6 +21,8 @@
 #include <QVector>
 #include <QByteArray>
 #include <QString>
+#include <QMutex>
+#include <QMutexLocker>
 
 #include "../resultset.h"
 #include "../index.h"
@@ -33,10 +35,13 @@
 
 #include "event_generated.h"
 
+static QMutex sMutex;
+
 using namespace Akonadi2::ApplicationDomain;
 
 static TypeIndex &getIndex()
 {
+    QMutexLocker locker(&sMutex);
     static TypeIndex *index = 0;
     if (!index) {
         index = new TypeIndex("event");
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index 3cd221e..7934841 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -21,6 +21,8 @@
 #include <QVector>
 #include <QByteArray>
 #include <QString>
+#include <QMutex>
+#include <QMutexLocker>
 
 #include "../resultset.h"
 #include "../index.h"
@@ -33,10 +35,13 @@
 
 #include "folder_generated.h"
 
+static QMutex sMutex;
+
 using namespace Akonadi2::ApplicationDomain;
 
 static TypeIndex &getIndex()
 {
+    QMutexLocker locker(&sMutex);
     static TypeIndex *index = 0;
     if (!index) {
         index = new TypeIndex("folder");
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index a698b6d..8875d88 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -21,6 +21,8 @@
 #include <QVector>
 #include <QByteArray>
 #include <QString>
+#include <QMutex>
+#include <QMutexLocker>
 
 #include "../resultset.h"
 #include "../index.h"
@@ -33,10 +35,13 @@
 
 #include "mail_generated.h"
 
+static QMutex sMutex;
+
 using namespace Akonadi2::ApplicationDomain;
 
 static TypeIndex &getIndex()
 {
+    QMutexLocker locker(&sMutex);
     static TypeIndex *index = 0;
     if (!index) {
         index = new TypeIndex("mail");