corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #97658 Fixing build blocker. fixing js components after component registry has been

Browse Source 
created r=gagan
This commit is contained in:
dp@netscape.com
2001-08-30 22:59:12 +00:00
parent 3061b0ebb8
commit ebb3a6b157
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
xpcom/components/nsComponentManager.cpp
View File

@@ -17,9 +17,6 @@
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
@@ -769,14 +766,14 @@ nsComponentManagerImpl::PlatformFind(const nsCID &aCID, nsFactoryEntry* *result)
const char* componentType = componentTypeStr.get();
int type = -1;
if (NS_FAILED(rv))
if (NS_FAILED(rv)) {
if (rv == NS_ERROR_REG_NOT_FOUND) {
/* missing componentType, we assume application/x-moz-native */
type = NS_COMPONENT_TYPE_NATIVE;
}
else
return rv; // XXX translate error code?
else
return rv; // XXX translate error code?
}
if (type < 0) {
// Find the right loader type index
type = GetLoaderType(componentType);
@@ -892,8 +889,12 @@ nsresult nsComponentManagerImpl::PlatformPrePopulateRegistry()
getter_Copies(componentType))))
continue;
int loadertype = GetLoaderType(componentType);
if (loadertype < 0) {
loadertype = AddLoaderType(componentType);
}
nsFactoryEntry* entry =
new nsFactoryEntry(aClass, library, GetLoaderType(componentType));
new nsFactoryEntry(aClass, library, loadertype);
if (!entry)
continue;