mirror of https://github.com/acidanthera/audk.git
Fix the bug of library instance selection interference between different archs of ModuleSA.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1137 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
c941b270ea
commit
57d0e52a71
|
@ -231,7 +231,7 @@ public class FpdFileContents {
|
|||
ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();
|
||||
while(li.hasNext()) {
|
||||
ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next();
|
||||
if (msa.getModuleGuid().equals(s[0]) && msa.getPackageGuid().equals(s[2])) {
|
||||
if (msa.getModuleGuid().equalsIgnoreCase(s[0]) && msa.getPackageGuid().equalsIgnoreCase(s[2])) {
|
||||
if (msa.getModuleVersion() != null) {
|
||||
if (!msa.getModuleVersion().equals(s[1])) {
|
||||
continue;
|
||||
|
|
|
@ -518,7 +518,7 @@ public class FpdFrameworkModules extends IInternalFrame {
|
|||
|
||||
while(ispi.hasNext()) {
|
||||
PackageIdentification pi = (PackageIdentification)ispi.next();
|
||||
if ( !pi.getGuid().equals(keyPart[2])){
|
||||
if ( !pi.getGuid().equalsIgnoreCase(keyPart[2])){
|
||||
|
||||
continue;
|
||||
}
|
||||
|
@ -531,7 +531,7 @@ public class FpdFrameworkModules extends IInternalFrame {
|
|||
Iterator ismi = smi.iterator();
|
||||
while(ismi.hasNext()) {
|
||||
ModuleIdentification mi = (ModuleIdentification)ismi.next();
|
||||
if (mi.getGuid().equals(keyPart[0])){
|
||||
if (mi.getGuid().equalsIgnoreCase(keyPart[0])){
|
||||
if (keyPart[1] != null && keyPart[1].length() > 0 && !keyPart[1].equals("null")){
|
||||
if(!mi.getVersion().equals(keyPart[1])){
|
||||
continue;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue