X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fautogen%2FAutogenLibOrder.java;h=a131b89cc8c4129e763a2b6b3b62c7b94c5b65e5;hp=7e87e28ba39e98bb382e842392614bef3db2df05;hb=253d2919cd1ad0ee4365b5a57e990287e08d5c97;hpb=a5dd05b513de4bd0f246a05d45a41952a697d596

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
index 7e87e28ba3..a131b89cc8 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -158,7 +158,11 @@ public class AutogenLibOrder {
         // First, add the library instance without consumers to the Q
         //
         for (int i = 0; i < libInstanceList.length; ++i) {
-            if (libInstanceConsumedBy.get(libInstanceList[i]).size() == 0) {
+            if (libInstanceList[i] == null) {
+                continue;
+            }
+            
+            if (libInstanceConsumedBy.get(libInstanceList[i]) == null ||  libInstanceConsumedBy.get(libInstanceList[i]).size() == 0) {
                 noConsumerList.add(libInstanceList[i]);
             }
         }
@@ -174,7 +178,7 @@ public class AutogenLibOrder {
                     continue;
                 }
                 HashSet<ModuleIdentification> consumedBy = libInstanceConsumedBy.get(m);
-                if (consumedBy.size() == 0) {
+                if (consumedBy == null || consumedBy.size() == 0) {
                   continue;
                 }
 
@@ -194,7 +198,7 @@ public class AutogenLibOrder {
                     }
 
                     HashSet<ModuleIdentification> consumedBy = libInstanceConsumedBy.get(libInstance);
-                    if (consumedBy.size() == 0) {
+                    if (consumedBy == null || consumedBy.size() == 0) {
                         continue;
                     }
 
@@ -234,7 +238,7 @@ public class AutogenLibOrder {
         boolean HasError = false;
         for (int i = 0; i < libInstanceList.length; ++i) {
             HashSet<ModuleIdentification> consumedBy = libInstanceConsumedBy.get(libInstanceList[i]);
-            if (consumedBy.size() > 0 && libInstanceList[i].hasConstructor()) {
+            if (consumedBy != null && consumedBy.size() > 0 && libInstanceList[i].hasConstructor()) {
                 EdkLog.log(EdkLog.EDK_ERROR, libInstanceList[i].getName()
                            + " with constructor has a circular dependency!");
                 ModuleIdentification[] consumedByList = consumedBy.toArray(new ModuleIdentification[consumedBy.size()]);