Prevent crashes when debugger is visualizing a status and we dispose it

migueldeicaza · migueldeicaza · commit 793f1496385c · 2017-09-03T22:08:27.000-04:00
diff --git a/TensorFlowSharp/Tensorflow.cs b/TensorFlowSharp/Tensorflow.cs
@@ -279,6 +279,8 @@ public void SetStatusCode (TFCode code, string msg)
 		/// <value>The status code as an enumeration.</value>
 		public TFCode StatusCode {
 			get {
+				if (handle == IntPtr.Zero)
+					throw new ObjectDisposedException ("TFStatus");
 				return TF_GetCode (handle);
 			}
 		}
@@ -299,6 +301,9 @@ public TFCode StatusCode {
 		/// <returns>A <see cref="T:System.String"/> that represents the current <see cref="T:TensorFlow.TFStatus"/>.</returns>
 		public override string ToString ()
 		{
+			if (handle == IntPtr.Zero)
+				throw new ObjectDisposedException ("TFStatus");
+			
 			return string.Format ("[TFStatus: StatusCode={0}, StatusMessage={1}]", StatusCode, StatusMessage);
 		}
 
@@ -342,7 +347,8 @@ internal bool CheckMaybeRaise (TFStatus incomingStatus, bool last = true)
 					Console.WriteLine ("oops");
 				if (StatusCode != TFCode.Ok) {
 					var e = new TFException (StatusMessage);
-					Dispose ();
+					if (last)
+						Dispose ();
 					throw e;
 				}
 				if (last)

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,8 @@ public void SetStatusCode (TFCode code, string msg)`
`279`	`279`	`/// <value>The status code as an enumeration.</value>`
`280`	`280`	`public TFCode StatusCode {`
`281`	`281`	`get {`
	`282`	`+ if (handle == IntPtr.Zero)`
	`283`	`+ throw new ObjectDisposedException ("TFStatus");`
`282`	`284`	`return TF_GetCode (handle);`
`283`	`285`	`}`
`284`	`286`	`}`
`@@ -299,6 +301,9 @@ public TFCode StatusCode {`
`299`	`301`	`/// <returns>A <see cref="T:System.String"/> that represents the current <see cref="T:TensorFlow.TFStatus"/>.</returns>`
`300`	`302`	`public override string ToString ()`
`301`	`303`	`{`
	`304`	`+ if (handle == IntPtr.Zero)`
	`305`	`+ throw new ObjectDisposedException ("TFStatus");`
	`306`	`+`
`302`	`307`	`return string.Format ("[TFStatus: StatusCode={0}, StatusMessage={1}]", StatusCode, StatusMessage);`
`303`	`308`	`}`
`304`	`309`
`@@ -342,7 +347,8 @@ internal bool CheckMaybeRaise (TFStatus incomingStatus, bool last = true)`
`342`	`347`	`Console.WriteLine ("oops");`
`343`	`348`	`if (StatusCode != TFCode.Ok) {`
`344`	`349`	`var e = new TFException (StatusMessage);`
`345`		`- Dispose ();`
	`350`	`+ if (last)`
	`351`	`+ Dispose ();`
`346`	`352`	`throw e;`
`347`	`353`	`}`
`348`	`354`	`if (last)`