Add detach replica in shutdown function when error occurs during apply segment of journal

XaBbl4 · XaBbl4 · commit 13e1e9b12667 · 2025-08-04T14:51:57.000+03:00
diff --git a/src/remote/server/ReplServer.cpp b/src/remote/server/ReplServer.cpp
@@ -416,7 +416,12 @@ namespace
 
 		void shutdown()
 		{
+			FbLocalStatus localStatus;
+			if (m_replicator.hasData())
+				m_replicator->close(&localStatus);
 			m_replicator = nullptr;
+			if (m_attachment.hasData())
+				m_attachment->detach(&localStatus);
 			m_attachment = nullptr;
 			m_sequence = 0;
 			m_connected = false;
@@ -437,7 +442,7 @@ namespace
 
 		bool isShutdown() const
 		{
-			return (m_attachment == NULL);
+			return (m_attachment == nullptr);
 		}
 
 		const PathName& getDirectory() const

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,12 @@ namespace`
`416`	`416`
`417`	`417`	`void shutdown()`
`418`	`418`	`{`
	`419`	`+ FbLocalStatus localStatus;`
	`420`	`+ if (m_replicator.hasData())`
	`421`	`+ m_replicator->close(&localStatus);`
`419`	`422`	`m_replicator = nullptr;`
	`423`	`+ if (m_attachment.hasData())`
	`424`	`+ m_attachment->detach(&localStatus);`
`420`	`425`	`m_attachment = nullptr;`
`421`	`426`	`m_sequence = 0;`
`422`	`427`	`m_connected = false;`
`@@ -437,7 +442,7 @@ namespace`
`437`	`442`
`438`	`443`	`bool isShutdown() const`
`439`	`444`	`{`
`440`		`- return (m_attachment == NULL);`
	`445`	`+ return (m_attachment == nullptr);`
`441`	`446`	`}`
`442`	`447`
`443`	`448`	`const PathName& getDirectory() const`