For encapsulated sections in FFS layout in FpdBuildOptions, if no longer exists secti...

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdFileContents.java

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 fdf5fb55e77f2dff6f78ae3638588040ad104541..130b625e753a22606fc21ee5a8ac67395be600d6 100644 (file)
--- 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
@@ -402,6 +402,9 @@ public class FpdFileContents {
         String[][] saaLib = new String[libCount][5];\r
         getLibraryInstances(moduleKey, saaLib);\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
+        if (mi == null) {\r
+            throw new Exception ("Module does NOT exist in workspace.");\r
+        }\r
         Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
         //\r
         // create vector for module & library instance MIs.\r
@@ -417,6 +420,9 @@ public class FpdFileContents {
 \r
                 for (int j = 0; j < vMi.size(); ++j) {\r
                     ModuleIdentification nextMi = vMi.get(j);\r
+                    if (nextMi == null) {\r
+                        continue;\r
+                    }\r
                     if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], nextMi)) {\r
                         continue nextPcd;\r
                     }\r