Implement GDALPamDataset::Close()

Author: rouault

gcore/gdal_pam.h

@@ -137,6 +137,8 @@ class CPL_DLL GDALPamDataset : public GDALDataset
   public:
     ~GDALPamDataset() override;
 
+    CPLErr Close() override;
+
     CPLErr FlushCache(bool bAtClosing) override;
 
     const OGRSpatialReference *GetSpatialRef() const override;

gcore/gdalpamdataset.cpp

@@ -148,20 +148,37 @@ GDALPamDataset::GDALPamDataset()
 GDALPamDataset::~GDALPamDataset()
 
 {
-    if (IsMarkedSuppressOnClose())
-    {
-        if (psPam && psPam->pszPamFilename != nullptr)
-            VSIUnlink(psPam->pszPamFilename);
-    }
-    else if (nPamFlags & GPF_DIRTY)
-    {
-        CPLDebug("GDALPamDataset", "In destructor with dirty metadata.");
-        GDALPamDataset::TrySaveXML();
-    }
+    GDALPamDataset::Close();
 
     PamClear();
 }
 
+/************************************************************************/
+/*                              Close()                                 */
+/************************************************************************/
+
+CPLErr GDALPamDataset::Close()
+{
+    CPLErr eErr = CE_None;
+    if (nOpenFlags != OPEN_FLAGS_CLOSED)
+    {
+        if (IsMarkedSuppressOnClose())
+        {
+            if (psPam && psPam->pszPamFilename != nullptr)
+                VSIUnlink(psPam->pszPamFilename);
+        }
+        else if (nPamFlags & GPF_DIRTY)
+        {
+            CPLDebug("GDALPamDataset", "In Close() with dirty metadata.");
+            eErr = GDALPamDataset::TrySaveXML();
+        }
+
+        if (GDALDataset::Close() != CE_None)
+            eErr = CE_Failure;
+    }
+    return eErr;
+}
+
 /************************************************************************/
 /*                             FlushCache()                             */
 /************************************************************************/