pythonnet
diff --git a/‎src/runtime/Runtime.cs‎
Lines changed: 1 addition & 5 deletions b/‎src/runtime/Runtime.cs‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎src/runtime/StateSerialization/NoopFormatter.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/runtime/StateSerialization/NoopFormatter.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/runtime/StateSerialization/RuntimeData.cs‎
Lines changed: 14 additions & 14 deletions b/‎src/runtime/StateSerialization/RuntimeData.cs‎
Lines changed: 14 additions & 14 deletions
@@ -164,11 +164,7 @@ internal static void Initialize(bool initSigs = false)
             // Initialize modules that depend on the runtime class.
             AssemblyManager.Initialize();
             OperatorMethod.Initialize();
-            if (RuntimeData.HasStashData())
-            {
-                RuntimeData.RestoreRuntimeData();
-            }
-            else
+            if (!RuntimeData.RestoreRuntimeData())
             {
                 PyCLRMetaType = MetaType.Initialize();
                 ImportHook.Initialize();
 
@@ -5,7 +5,7 @@
 namespace Python.Runtime;
 
 public class NoopFormatter : IFormatter {
-    public object Deserialize(Stream s) => throw new NotImplementedException();
+    public object Deserialize(Stream s) => null; // throw new NotImplementedException();
     public void Serialize(Stream s, object o) {}
 
     public SerializationBinder? Binder { get; set; }
 
@@ -112,47 +112,47 @@ internal static void Stash()
             PostStashHook?.Invoke();
         }
 
-        internal static void RestoreRuntimeData()
+        internal static bool RestoreRuntimeData()
         {
             try
             {
-                RestoreRuntimeDataImpl();
+                return RestoreRuntimeDataImpl();
             }
             finally
             {
                 ClearStash();
             }
         }
 
-        private static void RestoreRuntimeDataImpl()
+        private static bool RestoreRuntimeDataImpl()
         {
             PreRestoreHook?.Invoke();
             BorrowedReference capsule = PySys_GetObject("clr_data");
             if (capsule.IsNull)
             {
-                return;
+                return false;
             }
             IntPtr mem = PyCapsule_GetPointer(capsule, IntPtr.Zero);
             int length = (int)Marshal.ReadIntPtr(mem);
             byte[] data = new byte[length];
             Marshal.Copy(mem + IntPtr.Size, data, 0, length);
             var ms = new MemoryStream(data);
             var formatter = CreateFormatter();
-            var storage = (PythonNetState)formatter.Deserialize(ms);
 
-            PyCLRMetaType = MetaType.RestoreRuntimeData(storage.Metatype);
+            if (formatter.Deserialize(ms) is PythonNetState storage)
+            {
+                PyCLRMetaType = MetaType.RestoreRuntimeData(storage.Metatype);
 
-            TypeManager.RestoreRuntimeData(storage.Types);
-            ClassManager.RestoreRuntimeData(storage.Classes);
+                TypeManager.RestoreRuntimeData(storage.Types);
+                ClassManager.RestoreRuntimeData(storage.Classes);
 
-            RestoreRuntimeDataObjects(storage.SharedObjects);
+                RestoreRuntimeDataObjects(storage.SharedObjects);
 
-            ImportHook.RestoreRuntimeData(storage.ImportHookState);
-        }
+                ImportHook.RestoreRuntimeData(storage.ImportHookState);
+                return true;
+            }
 
-        public static bool HasStashData()
-        {
-            return !PySys_GetObject("clr_data").IsNull;
+            return false;
         }
 
         public static void ClearStash()
Original file line number	Diff line number	Diff line change
@@ -112,47 +112,47 @@ internal static void Stash()
112	112	PostStashHook?.Invoke();
113	113	}
114	114
115		- internal static void RestoreRuntimeData()
	115	+ internal static bool RestoreRuntimeData()
116	116	{
117	117	try
118	118	{
119		- RestoreRuntimeDataImpl();
	119	+ return RestoreRuntimeDataImpl();
120	120	}
121	121	finally
122	122	{
123	123	ClearStash();
124	124	}
125	125	}
126	126
127		- private static void RestoreRuntimeDataImpl()
	127	+ private static bool RestoreRuntimeDataImpl()
128	128	{
129	129	PreRestoreHook?.Invoke();
130	130	BorrowedReference capsule = PySys_GetObject("clr_data");
131	131	if (capsule.IsNull)
132	132	{
133		- return;
	133	+ return false;
134	134	}
135	135	IntPtr mem = PyCapsule_GetPointer(capsule, IntPtr.Zero);
136	136	int length = (int)Marshal.ReadIntPtr(mem);
137	137	byte[] data = new byte[length];
138	138	Marshal.Copy(mem + IntPtr.Size, data, 0, length);
139	139	var ms = new MemoryStream(data);
140	140	var formatter = CreateFormatter();
141		- var storage = (PythonNetState)formatter.Deserialize(ms);
142	141
143		- PyCLRMetaType = MetaType.RestoreRuntimeData(storage.Metatype);
	142	+ if (formatter.Deserialize(ms) is PythonNetState storage)
	143	+ {
	144	+ PyCLRMetaType = MetaType.RestoreRuntimeData(storage.Metatype);
144	145
145		- TypeManager.RestoreRuntimeData(storage.Types);
146		- ClassManager.RestoreRuntimeData(storage.Classes);
	146	+ TypeManager.RestoreRuntimeData(storage.Types);
	147	+ ClassManager.RestoreRuntimeData(storage.Classes);
147	148
148		- RestoreRuntimeDataObjects(storage.SharedObjects);
	149	+ RestoreRuntimeDataObjects(storage.SharedObjects);
149	150
150		- ImportHook.RestoreRuntimeData(storage.ImportHookState);
151		- }
	151	+ ImportHook.RestoreRuntimeData(storage.ImportHookState);
	152	+ return true;
	153	+ }
152	154
153		- public static bool HasStashData()
154		- {
155		- return !PySys_GetObject("clr_data").IsNull;
	155	+ return false;
156	156	}
157	157
158	158	public static void ClearStash()