Rewrote the error message output when module cannnot be found in any packages.

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / global / GlobalData.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index d3390438421d659c4531950faecc446138dbc5a1..77beb85baee0f699743dfd5474c9f388d1c35b14 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -302,19 +302,19 @@ public class GlobalData {
         PackageIdentification packageId = null;\r
         Iterator iter = packageList.iterator();\r
         while (iter.hasNext()) {\r
-            packageId = (PackageIdentification)iter.next();\r
-            moduleId.setPackage(packageId);\r
-            Spd spd = spdTable.get(packageId);\r
+            PackageIdentification pid = (PackageIdentification)iter.next();\r
+            Spd spd = spdTable.get(pid);\r
             File tempMsaFile = null;\r
             if ((tempMsaFile = spd.getModuleFile(moduleId)) != null ) {\r
                 if (tempMsaFile.getParent().equalsIgnoreCase(moduleId.getMsaFile().getParent())) {\r
+                    packageId = pid;\r
                     break ;\r
                 }\r
                 tempMsaFile = null;\r
             }\r
         }\r
         if (packageId == null){\r
-            throw new EdkException("Can't find Module [" + moduleId.getName() + "] in any SPD package!");\r
+            throw new EdkException("Can't find Module [" + moduleId.getName() + "] in any package!");\r
         } else {\r
             return packageId;\r
         }\r
@@ -648,7 +648,7 @@ public class GlobalData {
                 return moduleId;\r
             }\r
         }\r
-        throw new EdkException("Can't find module GUID value " + moduleId.toGuidString() + " in " + packageId + " under the current workspace!");\r
+        throw new EdkException("Can't find " + moduleId + " under the current workspace!");\r
     }\r
 \r
     public synchronized static Set<PackageIdentification> getPackageList(){\r