1. Fix EDKT379: Check if Constructor exists in a library when user adds a destructor

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / ModuleExterns.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
index 4b4ea0daa2067a861f996e23d8a6817201bf0633..d35bbafa59cd3126f44571095c7fc9a869b0a4f1 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
@@ -472,11 +472,13 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
             // Save pcd and flash map information first\r
             //\r
             Externs ex = Externs.Factory.newInstance();\r
-            if (this.externs.getPcdIsDriver() != null) {\r
-                ex.setPcdIsDriver(this.externs.getPcdIsDriver());\r
-            }\r
-            if (this.externs.getTianoR8FlashMapH()) {\r
-                ex.setTianoR8FlashMapH(this.externs.getTianoR8FlashMapH());\r
+            if (this.externs != null) {\r
+                if (this.externs.getPcdIsDriver() != null) {\r
+                    ex.setPcdIsDriver(this.externs.getPcdIsDriver());\r
+                }\r
+                if (this.externs.getTianoR8FlashMapH()) {\r
+                    ex.setTianoR8FlashMapH(this.externs.getTianoR8FlashMapH());\r
+                }\r
             }\r
             this.externs = ex;\r
 \r