fixed bug occurred when new msa file and spd file are in the same directory.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1985 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java b/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java
index ea86bef84f941ba8c9aa5b83be59f50921b2bc6f..4d4b215267352bf1d646d52541581785165d6187 100644 (file)
--- a/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java
+++ b/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java
@@ -1829,8 +1829,17 @@ public class CombineMsa {
             System.out.println("Please use the FrameworkWizard to add this MSA file to the package.");\r
             System.exit(FAIL);\r
         }\r
             System.out.println("Please use the FrameworkWizard to add this MSA file to the package.");\r
             System.exit(FAIL);\r
         }\r

-        path2Msa = Cwd.replace(path2Spd, "");\r
-        path2Msa = path2Msa + "/" + msaFn;\r
+               if (path2Spd.equals(Cwd + "/")) \r
+               {\r
+                       //  .msa file and .spd in the same directory\r
+                       path2Msa = msaFn;\r
+               } \r
+               else \r
+               {\r
+                       path2Msa = Cwd.replace(path2Spd, "");\r
+                       path2Msa = path2Msa + "/" + msaFn;\r
+               }\r
+\r

         return path2Msa;\r
     }\r
 \r
         return path2Msa;\r
     }\r
 \r