* DirectoryScanner.cs (Scan): Ignore empty entries in includes and

excludes.

svn path=/trunk/mcs/; revision=140999

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
index 161b069638e60c89d6377b12b714d9a5e1ed9ad1..845b66d57891744be8b752074028821a03875ba3 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-01  Ankit Jain  <jankit@novell.com>
+
+       * DirectoryScanner.cs (Scan): Ignore empty entries in includes and
+       excludes.
+
 2009-09-01  Ankit Jain  <jankit@novell.com>
 
        * Expression.cs (ParseOptions): New enum. Replace the bool params

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
index ccb0dfd613a1569dc7495be0c350a3ddd88b3c03..2d1eb46751fc165a2179e1647a193f886e378e08 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
@@ -59,8 +59,8 @@ namespace Microsoft.Build.BuildEngine {
                        excludedItems = new Dictionary <string, bool> ();
                        includedItems = new List <string> ();
                        
-                       splitInclude = includes.Split (';');
-                       splitExclude = excludes.Split (';');
+                       splitInclude = includes.Split (new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+                       splitExclude = excludes.Split (new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);
                        
                        if (excludes != String.Empty) {
                                foreach (string si in splitExclude) {