X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFileContents.java;fp=Tools%2FJava%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFileContents.java;h=adc6d265a107017917e05d62cca8548487e5386c;hp=594390c3283e47e29ecad52b6d48c4a19f45bcd2;hb=fd0f684ffa1f4a39f6e67b6209cef11f490017ed;hpb=9e011eacdbc44b753abac2cb77998f84412a7d10

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 594390c328..adc6d265a1 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -786,9 +786,24 @@ public class FpdFileContents {
             String[][] saa = new String[count][5];
             getLibraryInstances (key, saa);
             for (int i = 0; i < count; ++i) {
-                if (mg.equalsIgnoreCase(saa[i][1]) && mv.equalsIgnoreCase(saa[i][2]) && pg.equalsIgnoreCase(saa[i][3]) && pv.equalsIgnoreCase(saa[i][4])) {
+                if (mg.equalsIgnoreCase(saa[i][1]) && pg.equalsIgnoreCase(saa[i][3])) {
+                    boolean modVerMatch = false;
+                    boolean pkgVerMatch = false;
+                    if ((mv.equals("null") || saa[i][2] == null)) {
+                        modVerMatch = true;
+                    }
+                    if (pv.equals("null") || saa[i][4] == null) {
+                        pkgVerMatch = true;
+                    }
+                    if (modVerMatch && pkgVerMatch) {
                     return true;
                 }
+                    else {
+                        if (mv.equals(saa[i][2]) && pv.equals(saa[i][4])) {
+                            return true;
+                        }
+                    }
+                }
             }
         }
         return false;