fixup_02b11050f19895fe13ba8be27021e27ecac9357f

qgis · May 29, 2020 · bfaf0ef · bfaf0ef
1 parent 02ac606
commit bfaf0ef
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -84,18 +84,11 @@ const QString QgsAuthManager::AUTH_PASSWORD_HELPER_DISPLAY_NAME( "Password Manag
 
 QgsAuthManager *QgsAuthManager::instance()
 {
-  // NOTE cppcheck complains about identicalInnerCondition. Pedantically
-  // the below construct is not totally thread-safe.
-  // See https://preshing.com/20130930/double-checked-locking-is-fixed-in-cpp11/
-  // regarding double-checked locking pattern (DCLP)
+  static QMutex sMutex;
+  QMutexLocker locker( &sMutex );
   if ( !sInstance )
   {
-    static QMutex sMutex;
-    QMutexLocker locker( &sMutex );
-    if ( !sInstance )
-    {
-      sInstance = new QgsAuthManager( );
-    }
+    sInstance = new QgsAuthManager( );
   }
   return sInstance;
 }