Changed calls to disableLogging and enableLogging to work the way they used to.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@479 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-05-30 21:31:58 +00:00
parent 82041bb5c7
commit f9a8601e63
9 changed files with 109 additions and 76 deletions

View File

@@ -49,7 +49,7 @@ RCODE F_Db::reduceSize(
FLMBOOL bFlagSet;
FLMBOOL bTransActive = FALSE;
FLMBOOL bLockedDb = FALSE;
FLMBOOL bEnableLogging = FALSE;
FLMUINT uiRflToken = 0;
uiNumBlksMoved = 0;
@@ -92,8 +92,7 @@ RCODE F_Db::reduceSize(
// Disable RFL logging - don't want anything logged during reduce
// except for the reduce packet.
bEnableLogging = pRfl->isLoggingEnabled();
pRfl->disableLogging();
pRfl->disableLogging( &uiRflToken);
// Keep looping to here until the count is satisfied or there
// are not any more log extent blocks to turn into avail blks.
@@ -240,7 +239,7 @@ RCODE F_Db::reduceSize(
// restore or recovery. Will need to re-enable logging temporarily
// and then turn it back off after logging the packet.
pRfl->enableLogging();
pRfl->enableLogging( &uiRflToken);
// Log the reduce.
@@ -251,7 +250,7 @@ RCODE F_Db::reduceSize(
// Turn logging back off.
pRfl->disableLogging();
pRfl->disableLogging( &uiRflToken);
if (RC_BAD( rc))
{
@@ -298,9 +297,9 @@ Exit:
*puiCount = uiNumBlksMoved;
}
if (bEnableLogging)
if (uiRflToken)
{
pRfl->enableLogging();
pRfl->enableLogging( &uiRflToken);
}
if (bLockedDb)