2004-02-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Process.cs: ExitCode and ExitTime check that the process is finished.

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

2 files changed, 21 insertions, 2 deletions

diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
index 787481f314d..24fc6347228 100644
--- a/mcs/class/System/System.Diagnostics/ChangeLog
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Process.cs: ExitCode and ExitTime check that the process is finished.
+
 2003-12-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* Process.cs: if there's an error when starting the process, the 'pid'
diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
index 1de6f0f4b17..313b88d78db 100755
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -71,7 +71,15 @@ namespace System.Diagnostics {
 		[MonitoringDescription ("The exit code of the process.")]
 		public int ExitCode {
 			get {
-				return(ExitCode_internal(process_handle));
+				if (process_handle == IntPtr.Zero)
+					throw new InvalidOperationException ("Process has not been started.");
+
+				int code = ExitCode_internal (process_handle);
+				if (code == 259)
+					throw new InvalidOperationException ("The process must exit before " +
+									"getting the requested information.");
+
+				return code;
 			}
 		}
 
@@ -85,6 +93,13 @@ namespace System.Diagnostics {
 		[MonitoringDescription ("The exit time of the process.")]
 		public DateTime ExitTime {
 			get {
+				if (process_handle == IntPtr.Zero)
+					throw new InvalidOperationException ("Process has not been started.");
+
+				if (!HasExited)
+					throw new InvalidOperationException ("The process must exit before " +
+									"getting the requested information.");
+
 				return(DateTime.FromFileTime(ExitTime_internal(process_handle)));
 			}
 		}
@@ -110,7 +125,7 @@ namespace System.Diagnostics {
 		[MonitoringDescription ("Determines if the process is still running.")]
 		public bool HasExited {
 			get {
-				int exitcode=ExitCode;
+				int exitcode = ExitCode_internal (process_handle);
 
 				if(exitcode==259) {
 					/* STILL_ACTIVE */