remove unnecessary check for NULL pointer.

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / toolchain / ConfigReader.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
index fa1fc239f4ffd26d6ff1637176aa77503fd85a6f..4275f8eb78f4229c6bb33b63e33f0251f8752d5a 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 package org.tianocore.build.toolchain;\r
 \r
+import org.apache.tools.ant.Project;\r
+\r
 import org.tianocore.build.exception.GenBuildException;\r
 \r
 import java.io.BufferedReader;\r
@@ -38,8 +40,8 @@ public class ConfigReader {
 \r
       @return String[][]    The definition array\r
     **/\r
-    public static synchronized String[][] parse(String filename) throws GenBuildException {\r
-        return parse(new File(filename));\r
+    public static synchronized String[][] parse(Project prj, String filename) throws GenBuildException {\r
+        return parse(prj, new File(filename));\r
     }\r
 \r
     /**\r
@@ -53,7 +55,7 @@ public class ConfigReader {
       @throws   GenBuildException\r
                 Config file's format is not valid\r
     **/\r
-    public static synchronized String[][] parse(File configFile) throws GenBuildException {\r
+    public static synchronized String[][] parse(Project prj, File configFile) throws GenBuildException {\r
         List<String> keyList = new ArrayList<String>(256);\r
         List<String> valueList = new ArrayList<String>(256);\r
         int lines = 0;\r
@@ -87,7 +89,11 @@ public class ConfigReader {
                 // look as line "A = B"\r
                 //\r
                 keyList.add(str.substring(0, index).trim());\r
-                valueList.add(str.substring(index + 1).trim());\r
+                if (prj != null) {\r
+                    valueList.add(prj.replaceProperties(str.substring(index + 1).trim()));\r
+                } else {\r
+                    valueList.add(str.substring(index + 1).trim());\r
+                }\r
             }\r
         } catch (Exception ex) {\r
             GenBuildException e = new GenBuildException("ERROR Processing file [" \r