[Firebird-checkins] CVS: firebird2/src/jrd DatabaseSnapshot.cpp, 1.44.2.25, 1.44.2.26

[Dmitry Y. <di...@us...>]

Build Version :  T2.5.0.24273 Firebird 2.5 Beta 1

(writeBuildNum.sh,v 1.24437 2009/06/16 06:18:41 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21731

Modified Files:
      Tag: B2_1_Release
	DatabaseSnapshot.cpp 
Log Message:
This change allows the valid backup state to be reported via MON$DATABASE. While the nbak_state_unknown state still can be dumped into the shared memory by an AST, it never goes into the monitoring tables due to the special handling for MON$DATABASE.

Index: DatabaseSnapshot.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/DatabaseSnapshot.cpp,v
retrieving revision 1.44.2.25
retrieving revision 1.44.2.26
diff -b -U3 -r1.44.2.25 -r1.44.2.26
--- DatabaseSnapshot.cpp	11 Jun 2009 14:46:12 -0000	1.44.2.25
+++ DatabaseSnapshot.cpp	16 Jun 2009 06:18:40 -0000	1.44.2.26
@@ -446,8 +446,14 @@
 	// Release our own lock
 	LCK_release(tdbb, dbb->dbb_monitor_lock);
 
+	{ // scope for the RAII object
+
+		// Ensure we'll be dealing with a valid backup state inside the call below
+		BackupManager::SharedDatabaseHolder holder(tdbb, dbb->dbb_backup_manager);
+
 	// Dump our own data
 	dumpData(tdbb, false);
+	}
 
 	// Signal other processes to dump their data
 	Lock temp_lock, *lock = &temp_lock;