From 9d3d149f81a92771cffb5aacc99c324dde9847ab Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 23 Jan 2007 09:48:03 +0000
Subject: [PATCH] Fixed the fake circular denpendency of library instance.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2285 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../org/tianocore/build/autogen/AutogenLibOrder.java   | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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 ca415daf90..7e87e28ba3 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -91,7 +91,7 @@ public class AutogenLibOrder {
             // Create library class consume database.
             //
             libClassConsmList = saq.getLibraryClasses(CommonDefinition.ALWAYSCONSUMED, arch, null);
-            if (libClassConsmList.length > 0) {
+            if (libClassConsmList != null) {
                 if (this.libInstanceConsumes.containsKey(libInstance)) {
                     throw new AutoGenException(
                             libraryList[i].getName()
@@ -105,7 +105,7 @@ public class AutogenLibOrder {
             // Create library class implementer database
             //
             libClassDeclList = saq.getLibraryClasses(CommonDefinition.ALWAYSPRODUCED, arch, null);
-            if (libClassDeclList.length > 0) {
+            if (libClassDeclList != null) {
                 this.libInstanceProduces.put(libInstance, libClassDeclList);
                 for (int j = 0; j < libClassDeclList.length; j++) {
                     if (this.libClassProducer.containsKey(libClassDeclList[j])) {
@@ -132,9 +132,6 @@ public class AutogenLibOrder {
             for (int k = 0; k < libraryList.length; ++k) {
                 ModuleIdentification consumer = libraryList[k];
                 String[] consumedClassList = libInstanceConsumes.get(consumer);
-                if (consumedClassList == null) {
-                    continue;
-                }
 
                 for (int l = 0; l < consumedClassList.length; ++l) {
                     if (consumedClassList[l].equals(className)) {
@@ -171,9 +168,6 @@ public class AutogenLibOrder {
             orderList.addFirst(n);
 
             String[] consumedClassList = libInstanceConsumes.get(n);
-            if (consumedClassList == null) {
-                continue;
-            }
             for (int i = 0; i < consumedClassList.length; ++i) {
                 ModuleIdentification m = libClassProducer.get(consumedClassList[i]);
                 if (m == null) {
-- 
2.39.2