git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@511 6f19259b...

diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
index 2d90f38e33b053c5381ba6c0c764f41f6c59bf3c..9511eed3d56ba7df223aaa34b07e0a1c4067e338 100644 (file)
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
@@ -246,6 +246,9 @@ public class SpdFileContents {
      @param libClass Caller allocated two-dimentional String array\r
     **/\r
     public void getSpdLibClassDeclarations(String[][] libClass) {\r
+        if (psaRoot.getLibraryClassDeclarations() == null){\r
+            return;\r
+        }\r
         List<LibraryClassDeclarationDocument.LibraryClassDeclaration> l = psaRoot.getLibraryClassDeclarations()\r
                                                                                  .getLibraryClassDeclarationList();\r
         int i = 0;\r
@@ -283,6 +286,9 @@ public class SpdFileContents {
     @param msaFile Caller allocated two-dimentional String array\r
    **/\r
     public void getSpdMsaFiles(String[][] msaFile) {\r
+        if (psaRoot.getMsaFiles() == null) {\r
+            return;\r
+        }\r
         List<MsaFilesDocument.MsaFiles.MsaFile> l = psaRoot.getMsaFiles().getMsaFileList();\r
         int i = 0;\r
         ListIterator li = l.listIterator();\r
@@ -314,6 +320,10 @@ public class SpdFileContents {
     @param pkgHeader Caller allocated two-dimentional String array\r
    **/\r
     public void getSpdPackageHeaders(String[][] pkgHeader) {\r
+        if (psaRoot.getPackageHeaders() == null) {\r
+            return;\r
+        }\r
+\r
         List<IncludeHeaderDocument.IncludeHeader> l = psaRoot.getPackageHeaders().getIncludeHeaderList();\r
         int i = 0;\r
         ListIterator li = l.listIterator();\r
@@ -346,6 +356,10 @@ public class SpdFileContents {
     @param guid Caller allocated two-dimentional String array\r
    **/\r
     public void getSpdGuidDeclarations(String[][] guid) {\r
+        if (psaRoot.getGuidDeclarations() == null) {\r
+            return;\r
+        }\r
+        \r
         List<GuidDeclarationsDocument.GuidDeclarations.Entry> l = psaRoot.getGuidDeclarations().getEntryList();\r
         int i = 0;\r
         ListIterator li = l.listIterator();\r
@@ -379,6 +393,10 @@ public class SpdFileContents {
     @param protocol Caller allocated two-dimentional String array\r
    **/\r
     public void getSpdProtocolDeclarations(String[][] protocol) {\r
+        if (psaRoot.getProtocolDeclarations() == null) {\r
+            return;\r
+        }\r
+        \r
         List<ProtocolDeclarationsDocument.ProtocolDeclarations.Entry> l = psaRoot.getProtocolDeclarations()\r
                                                                                  .getEntryList();\r
         int i = 0;\r
@@ -413,6 +431,10 @@ public class SpdFileContents {
     @param ppi Caller allocated two-dimentional String array\r
    **/\r
     public void getSpdPpiDeclarations(String[][] ppi) {\r
+        if (psaRoot.getPpiDeclarations() == null) {\r
+            return;\r
+        }\r
+        \r
         List<PpiDeclarationsDocument.PpiDeclarations.Entry> l = psaRoot.getPpiDeclarations().getEntryList();\r
         int i = 0;\r
         ListIterator li = l.listIterator();\r
@@ -446,6 +468,10 @@ public class SpdFileContents {
     @param pcd Caller allocated two-dimentional String array\r
    **/\r
     public void getSpdPcdDefinitions(String[][] pcd) {\r
+        if (psaRoot.getPcdDefinitions() == null) {\r
+            return;\r
+        }\r
+        \r
         List<PcdDefinitionsDocument.PcdDefinitions.PcdEntry> l = psaRoot.getPcdDefinitions().getPcdEntryList();\r
         int i = 0;\r
         ListIterator li = l.listIterator();\r