Add one more judgement for modulelist specified but empty.

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / fpd / FpdParserTask.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 106e6d6a072eec091ac5c0f94d7fb7869d773994..b496e32ed5de3ea933167369a1b7573bbc15bb45 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -283,17 +283,20 @@ public class FpdParserTask extends Task {
                 Set<FpdModuleIdentification> filesSet = fvs.get(validFv[i]);\r
                 \r
                 FpdModuleIdentification[] files = null;\r
+                \r
                 if (moduleSeqSet == null) {\r
                     if (filesSet != null) {\r
                         files = filesSet.toArray(new FpdModuleIdentification[filesSet.size()]);\r
                     }\r
+                } else if (filesSet == null) {\r
+                    if (moduleSeqSet.size() != 0) {\r
+                        throw new BuildException("Can not find any modules belongs to FV[" + validFv[i] + "], but listed some in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1']");\r
+                    }\r
                 } else {\r
                     //\r
                     // if moduleSeqSet and filesSet is inconsistent, report error\r
                     //\r
-                    if (filesSet == null && moduleSeqSet.size() != 0) {\r
-                        throw new BuildException("Can not find any modules belongs to FV[" + validFv[i] + "], but listed some in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1']");\r
-                    } else if(moduleSeqSet.size() != filesSet.size()){\r
+                    if(moduleSeqSet.size() != filesSet.size()){\r
                         throw new BuildException("Modules for FV[" + validFv[i] + "] defined in FrameworkModules and in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1'] are inconsistent. ");\r
                     } else {\r
                         //\r