X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FDatabase.java;fp=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FDatabase.java;h=c986d3b59bb8d853a9dfb571e6ccd689ca0702a4;hp=8b088c9cbb2135cad003c583c4d2b2f4d29e33cd;hb=4f60c26f936d5e878e9fb941f896868c6f452f18;hpb=482407d3d6faaa8eba7975d425c1e386b75dae6d

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
index 8b088c9cbb..c986d3b59b 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
@@ -17,15 +17,21 @@ import java.util.*;
 import java.util.regex.*;
 
 public final class Database {
-	Database(String path) throws Exception {
+	private static final Database INSTANCE = Database.init();
+	
+	Database(String path) {
 		DatabasePath = path;
-		
-		importDBLib("Library.csv");
-		importDBGuid("Guid.csv", "Guid");
-		importDBGuid("Ppi.csv", "Ppi");
-		importDBGuid("Protocol.csv", "Protocol");
-		importDBMacro("Macro.csv");
-		importListR8Only();
+
+		try {
+			importDBLib("Library.csv");
+			importDBGuid("Guid.csv", "Guid");
+			importDBGuid("Ppi.csv", "Ppi");
+			importDBGuid("Protocol.csv", "Protocol");
+			importDBMacro("Macro.csv");
+			importListR8Only();
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+		}
 	}
 	
 	public String DatabasePath;
@@ -165,12 +171,16 @@ public final class Database {
 	//-------------------------------------has------------------------------------------//
 	
 	//-------------------------------------init------------------------------------------//
-	
-	public static Database init() throws Exception {
+
+	private static final Database init() {
 		if (System.getenv("WORKSPACE") == null) {
 			return new Database("C:" + File.separator + "tianocore" + File.separator + "edk2" + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration");
 		} else {
 			return new Database(System.getenv("WORKSPACE") + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration");
 		}
 	}
+	
+	public static final Database getInstance() {
+		return INSTANCE;
+	}
 }