make sure the GIL is released in ThreadTest

tonyroberts · tonyroberts · commit 2b11631a5cc9 · 2014-04-11T11:01:37.000+01:00
diff --git a/pythonnet/src/testing/threadtest.cs b/pythonnet/src/testing/threadtest.cs
@@ -39,35 +39,43 @@ public class ThreadTest {
 
         public static string CallEchoString(string arg) {
             IntPtr gs = PythonEngine.AcquireLock();
-            if (module == null) {
-                module = PythonEngine.ModuleFromString("tt", testmod);
+            try {
+                if (module == null) {
+                    module = PythonEngine.ModuleFromString("tt", testmod);
+                }
+                PyObject func = module.GetAttr("echostring");
+                PyString parg = new PyString(arg);
+                PyObject temp = func.Invoke(parg);
+                string result = (string)temp.AsManagedObject(typeof(String));
+                func.Dispose();
+                parg.Dispose();
+                temp.Dispose();
+                return result;
+            }
+            finally {
+                PythonEngine.ReleaseLock(gs);
             }
-            PyObject func = module.GetAttr("echostring");
-            PyString parg = new PyString(arg);
-            PyObject temp = func.Invoke(parg);
-            string result = (string)temp.AsManagedObject(typeof(String));
-            func.Dispose();
-            parg.Dispose();
-            temp.Dispose();
-            PythonEngine.ReleaseLock(gs);
-            return result;
         }
 
         public static string CallEchoString2(string arg) {
             IntPtr gs = PythonEngine.AcquireLock();
-            if (module == null) {
-                module = PythonEngine.ModuleFromString("tt", testmod);
-            }
+            try {
+                if (module == null) {
+                    module = PythonEngine.ModuleFromString("tt", testmod);
+                }
 
-            PyObject func = module.GetAttr("echostring2");
-            PyString parg = new PyString(arg);
-            PyObject temp = func.Invoke(parg);
-            string result = (string)temp.AsManagedObject(typeof(String));
-            func.Dispose();
-            parg.Dispose();
-            temp.Dispose();
-            PythonEngine.ReleaseLock(gs);
-            return result;
+                PyObject func = module.GetAttr("echostring2");
+                PyString parg = new PyString(arg);
+                PyObject temp = func.Invoke(parg);
+                string result = (string)temp.AsManagedObject(typeof(String));
+                func.Dispose();
+                parg.Dispose();
+                temp.Dispose();
+                return result;
+            }
+            finally {
+                PythonEngine.ReleaseLock(gs);
+            }
         }
 
         
