Flush capabilities cache when flushing project layers

rldhont · rldhont · commit 7dcb9ccc6e9f · 2016-06-28T18:15:26.000+02:00
Made by @dmarteau
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 );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,12 @@ void QgsCapabilitiesCache::insertCapabilitiesDocument( const QString& configFile`
`61`	`61`	`mCachedCapabilities[ configFilePath ].insert( key, doc->cloneNode().toDocument() );`
`62`	`62`	`}`
`63`	`63`
	`64`	`+void QgsCapabilitiesCache::removeCapabilitiesDocument( const QString& path )`
	`65`	`+{`
	`66`	`+ mCachedCapabilities.remove( path );`
	`67`	`+ mFileSystemWatcher.removePath( path );`
	`68`	`+}`
	`69`	`+`
`64`	`70`	`void QgsCapabilitiesCache::removeChangedEntry( const QString& path )`
`65`	`71`	`{`
`66`	`72`	`QgsDebugMsg( "Remove capabilities cache entry because file changed" );`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,10 @@ void QgsServerInterfaceImpl::registerAccessControl( QgsAccessControlFilter* acce`
`77`	`77`
`78`	`78`	`void QgsServerInterfaceImpl::removeConfigCacheEntry( const QString& path )`
`79`	`79`	`{`
	`80`	`+ if( mCapabilitiesCache )`
	`81`	`+ {`
	`82`	`+ mCapabilitiesCache->removeCapabilitiesDocument( path );`
	`83`	`+ }`
`80`	`84`	`QgsConfigCache::instance()->removeEntry( path );`
`81`	`85`	`}`
`82`	`86`