Flush capabilities cache when flushing project layers

Made by @dmarteau
qgis · Jun 28, 2016 · 7dcb9cc · 7dcb9cc
1 parent bf53e4c
commit 7dcb9cc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/src/server/qgscapabilitiescache.cpp b/src/server/qgscapabilitiescache.cpp
@@ -61,6 +61,12 @@ void QgsCapabilitiesCache::insertCapabilitiesDocument( const QString& configFile
   mCachedCapabilities[ configFilePath ].insert( key, doc->cloneNode().toDocument() );
 }
 
+void QgsCapabilitiesCache::removeCapabilitiesDocument( const QString& path )
+{
+    mCachedCapabilities.remove( path );
+    mFileSystemWatcher.removePath( path );
+}
+
 void QgsCapabilitiesCache::removeChangedEntry( const QString& path )
 {
   QgsDebugMsg( "Remove capabilities cache entry because file changed" );

diff --git a/src/server/qgscapabilitiescache.h b/src/server/qgscapabilitiescache.h
@@ -44,6 +44,11 @@ class SERVER_EXPORT QgsCapabilitiesCache : public QObject
      */
     void insertCapabilitiesDocument( const QString& configFilePath, const QString& key, const QDomDocument* doc );
 
+    /** Remove capabilities document
+     * @param configFilePath the project file path
+     */
+    void removeCapabilitiesDocument( const QString& path );
+
   private:
     QHash< QString, QHash< QString, QDomDocument > > mCachedCapabilities;
     QFileSystemWatcher mFileSystemWatcher;

diff --git a/src/server/qgsserverinterfaceimpl.cpp b/src/server/qgsserverinterfaceimpl.cpp
@@ -77,6 +77,10 @@ void QgsServerInterfaceImpl::registerAccessControl( QgsAccessControlFilter* acce
 
 void QgsServerInterfaceImpl::removeConfigCacheEntry( const QString& path )
 {
+  if( mCapabilitiesCache )
+  {
+    mCapabilitiesCache->removeCapabilitiesDocument( path );
+  }
   QgsConfigCache::instance()->removeEntry( path );
 }