X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFileContents.java;h=f730fa2a6ee22cee410c272c63b5138f80e91df3;hb=5af6b67fdb381cd8e5193d9c66bba9108ea088ee;hp=617f74e0bd95996366a01a7159860a442c7e7b5b;hpb=e232295ec840142d72af4e25bc516ec74a2d0413;p=mirror_edk2.git

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 617f74e0bd..f730fa2a6e 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -182,7 +182,7 @@ public class FpdFileContents {
     }
     
     public int getFrameworkModulesCount() {
-        if (getfpdFrameworkModules().getModuleSAList() == null){
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){
             removeElement(getfpdFrameworkModules());
             fpdFrameworkModules = null;
             return 0;
@@ -223,7 +223,7 @@ public class FpdFileContents {
     
     public ModuleSADocument.ModuleSA getModuleSA(String key) {
         String[] s = key.split(" ");
-        if (getfpdFrameworkModules().getModuleSAList() == null) {
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {
             removeElement(getfpdFrameworkModules());
             fpdFrameworkModules = null;
             return null;
@@ -1034,7 +1034,7 @@ public class FpdFileContents {
     }
     
     public int getDynamicPcdBuildDataCount() {
-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {
+        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {
             removeElement(getfpdDynPcdBuildDefs());
             fpdDynPcdBuildDefs = null;
             return 0;
@@ -1043,7 +1043,7 @@ public class FpdFileContents {
     }
     
     public void getDynamicPcdBuildData(String[][] saa) {
-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {
+        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {
             removeElement(getfpdDynPcdBuildDefs());
             fpdDynPcdBuildDefs = null;
             return ;
@@ -1962,6 +1962,10 @@ public class FpdFileContents {
     
     public void getPlatformDefsSkuInfos(String[][] saa){
         if (getfpdPlatformDefs().getSkuInfo() == null || getfpdPlatformDefs().getSkuInfo().getUiSkuNameList() == null) {
+            if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {
+                removeElement(getfpdDynPcdBuildDefs());
+                fpdDynPcdBuildDefs = null;
+            }
             return ;
         }