1. Fix bug EDKT241 "If and MSA file is missing, the Wizard gives a NULL Pointer Excep...

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / common / GlobalData.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java
index 4c179929a592be616e4d91faa4f26d0a74a33544..a50d2f104ffcf5e317b27d835fdf634ef1399889 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java
@@ -93,10 +93,13 @@ public class GlobalData {
 \r
                     } catch (IOException e) {\r
                         Log.err("Open Module Surface Area " + modulePath, e.getMessage());\r
+                        continue;\r
                     } catch (XmlException e) {\r
                         Log.err("Open Module Surface Area " + modulePath, e.getMessage());\r
+                        continue;\r
                     } catch (Exception e) {\r
                         Log.err("Open Module Surface Area " + modulePath, "Invalid file type");\r
+                        continue;\r
                     }\r
                     id = Tools.getId(modulePath, msa);\r
                     mid = new ModuleIdentification(id, vPackageList.elementAt(indexI));\r
@@ -122,10 +125,13 @@ public class GlobalData {
                     spd = OpenFile.openSpdFile(path);\r
                 } catch (IOException e) {\r
                     Log.err("Open Package Surface Area " + path, e.getMessage());\r
+                    continue;\r
                 } catch (XmlException e) {\r
                     Log.err("Open Package Surface Area " + path, e.getMessage());\r
+                    continue;\r
                 } catch (Exception e) {\r
                     Log.err("Open Package Surface Area " + path, "Invalid file type");\r
+                    continue;\r
                 }\r
                 id = Tools.getId(path, spd);\r
                 vPackageList.addElement(id);\r
@@ -150,10 +156,13 @@ public class GlobalData {
                     fpd = OpenFile.openFpdFile(path);\r
                 } catch (IOException e) {\r
                     Log.err("Open Platform Surface Area " + path, e.getMessage());\r
+                    continue;\r
                 } catch (XmlException e) {\r
                     Log.err("Open Platform Surface Area " + path, e.getMessage());\r
+                    continue;\r
                 } catch (Exception e) {\r
                     Log.err("Open Platform Surface Area " + path, "Invalid file type");\r
+                    continue;\r
                 }\r
                 id = Tools.getId(path, fpd);\r
                 vPlatformList.addElement(new PlatformIdentification(id));\r