1 files changed, 8 insertions, 1 deletions
diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
index fa03258bdc..3155cf6329 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
@@ -23,7 +23,14 @@ public class LibraryClassVector {
         for (int index = 0; index < vLibraryClass.size(); index++) {
             if (vLibraryClass.elementAt(index).getLibraryClassName().equals(lib.getLibraryClassName())
                 && vLibraryClass.elementAt(index).getUsage().equals(lib.getUsage())) {
-                return index;
+                if (vLibraryClass.elementAt(index).getBelongModule() != null && lib.getBelongModule() != null) {
+                    if (vLibraryClass.elementAt(index).getBelongModule().equals(lib.getBelongModule())) {
+                        return index;
+                    }
+                }
+                if (vLibraryClass.elementAt(index).getBelongModule() == null && lib.getBelongModule() == null) {
+                    return index;
+                }
             }
         }
         return -1;