From 8dfffc9d42ad957d709bb57a16e4c719f3ec9458 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Fri, 24 Mar 2023 14:56:45 +0000
Subject: [PATCH] regIOobject: Rename objects owned by the registry

---
 src/OpenFOAM/db/regIOobject/regIOobject.C | 26 ++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 6b66a2a681..f4e0c659e6 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -420,6 +420,9 @@ void Foam::regIOobject::rename(const word& newName)
     // avoiding the checkOut/checkIn
     if (newName != name())
     {
+        const bool ownedByRegistry0 = ownedByRegistry();
+        release();
+
         // Check out of objectRegistry
         checkOut();
 
@@ -428,7 +431,14 @@ void Foam::regIOobject::rename(const word& newName)
         if (registerObject())
         {
             // Re-register object with objectRegistry
-            checkIn();
+            if (ownedByRegistry0)
+            {
+                store();
+            }
+            else
+            {
+                checkIn();
+            }
         }
     }
 }
@@ -466,6 +476,9 @@ void Foam::regIOobject::operator=(const IOobject& io)
     // Close any file
     isPtr_.clear();
 
+    const bool ownedByRegistry0 = ownedByRegistry();
+    release();
+
     // Check out of objectRegistry
     checkOut();
 
@@ -474,7 +487,14 @@ void Foam::regIOobject::operator=(const IOobject& io)
     if (registerObject())
     {
         // Re-register object with objectRegistry
-        checkIn();
+        if (ownedByRegistry0)
+        {
+            store();
+        }
+        else
+        {
+            checkIn();
+        }
     }
 }