Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

partial fix for bug 12166, where cleanup() is not getting called after install completes, thus file pointer for JAR/XPI files are not freed up afterwards.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@45064 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cathleen%netscape.com
1999-08-29 17:21:39 +00:00
parent d42d901505
commit 92be6bb5d8
1 changed files with 70 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
mozilla/xpinstall/src/nsInstall.cpp
View File

@@ -673,80 +673,84 @@ nsInstall::FinalizeInstall(PRInt32* aReturn)
return NS_OK;
}
if ( mInstalledFiles == NULL || mInstalledFiles->GetSize() == 0 )
if ( mInstalledFiles == NULL || mInstalledFiles->GetSize() > 0 )
{
if ( mUninstallPackage )
{
VR_UninstallCreateNode( (char*)(const char*) nsAutoCString(mRegistryPackageName),
(char*)(const char*) nsAutoCString(mUIName));
}
// Install the Component into the Version Registry.
if (mVersionInfo)
{
nsString versionString;
mVersionInfo->ToString(versionString);
VR_Install( (char*)(const char*)nsAutoCString(mRegistryPackageName),
nsnull,
(char*)(const char*)nsAutoCString(versionString),
PR_FALSE );
}
PRInt32 result;
nsInstallObject* ie = nsnull;
PRUint32 i=0;
for (i=0; i < mInstalledFiles->GetSize(); i++)
{
ie = (nsInstallObject*)mInstalledFiles->Get(i);
NS_ASSERTION(ie, "NULL object in install queue!");
if (ie == NULL)
continue;
char *objString = ie->toString();
if (mNotifier)
mNotifier->FinalizeProgress(nsAutoString(objString).GetUnicode(),
i, mInstalledFiles->GetSize());
if (objString)
delete [] objString;
result = ie->Complete();
if (result != nsInstall::SUCCESS)
{
if ( result == REBOOT_NEEDED )
{
rebootNeeded = PR_TRUE;
result = SUCCESS;
}
else
{
InternalAbort( result );
break;
}
}
}
if ( result != SUCCESS )
*aReturn = SaveError( result );
else if ( rebootNeeded )
*aReturn = SaveError( REBOOT_NEEDED );
if (mNotifier)
mNotifier->FinalStatus(mInstallURL.GetUnicode(), *aReturn);
}
else if ( mInstalledFiles == NULL || mInstalledFiles->GetSize() == 0 )
{
// no actions queued: don't register the package version
// and no need for user confirmation
CleanUp();
if (mNotifier)
mNotifier->FinalStatus(mInstallURL.GetUnicode(), *aReturn);
return NS_OK;
}
if ( mUninstallPackage )
{
VR_UninstallCreateNode( (char*)(const char*) nsAutoCString(mRegistryPackageName),
(char*)(const char*) nsAutoCString(mUIName));
}
// Install the Component into the Version Registry.
if (mVersionInfo)
{
nsString versionString;
mVersionInfo->ToString(versionString);
VR_Install( (char*)(const char*)nsAutoCString(mRegistryPackageName),
nsnull,
(char*)(const char*)nsAutoCString(versionString),
PR_FALSE );
}
PRInt32 result;
nsInstallObject* ie = nsnull;
PRUint32 i=0;
for (i=0; i < mInstalledFiles->GetSize(); i++)
{
ie = (nsInstallObject*)mInstalledFiles->Get(i);
NS_ASSERTION(ie, "NULL object in install queue!");
if (ie == NULL)
continue;
char *objString = ie->toString();
if (mNotifier)
mNotifier->FinalizeProgress(nsAutoString(objString).GetUnicode(),
i, mInstalledFiles->GetSize());
if (objString)
delete [] objString;
result = ie->Complete();
if (result != nsInstall::SUCCESS)
{
if ( result == REBOOT_NEEDED )
{
rebootNeeded = PR_TRUE;
result = SUCCESS;
}
else
{
InternalAbort( result );
break;
}
}
}
if ( result != SUCCESS )
*aReturn = SaveError( result );
else if ( rebootNeeded )
*aReturn = SaveError( REBOOT_NEEDED );
if (mNotifier)
mNotifier->FinalStatus(mInstallURL.GetUnicode(), *aReturn);
CleanUp();
return NS_OK;
}