[nant-commits] CVS: nant/src/NAnt.Core/Functions NAntFunctions.cs,1.20,1.21

[Gert D. <dri...@us...>]

Update of /cvsroot/nant/nant/src/NAnt.Core/Functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9136/src/NAnt.Core/Functions

Modified Files:
	NAntFunctions.cs 
Log Message:
ensure project functions do not return null values

Index: NAntFunctions.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.Core/Functions/NAntFunctions.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** NAntFunctions.cs	10 Nov 2004 07:17:22 -0000	1.20
--- NAntFunctions.cs	10 Nov 2004 07:56:58 -0000	1.21
***************
*** 98,106 ****
          /// </summary>
          /// <returns>
!         /// The name of the current project.
          /// </returns>
          [Function("get-name")]
          public string GetName() {
!             return Project.ProjectName;
          }
  
--- 98,107 ----
          /// </summary>
          /// <returns>
!         /// The name of the current project, or an empty <see cref="string" />
!         /// if no name is specified in the build file.
          /// </returns>
          [Function("get-name")]
          public string GetName() {
!             return StringUtils.ConvertNullToEmpty(Project.ProjectName);
          }
  
***************
*** 129,134 ****
          [Function("get-buildfile-path")]
          public string GetBuildFilePath() {
!             string buildFile = Project.BuildFileLocalName;
!             return (buildFile != null) ? buildFile : string.Empty;
          }
  
--- 130,134 ----
          [Function("get-buildfile-path")]
          public string GetBuildFilePath() {
!             return StringUtils.ConvertNullToEmpty(Project.BuildFileLocalName);
          }