Merge pull request #133 from peastman/master

Handle exceptions correctly inside getState()

Merge pull request #133 from peastman/master
Handle exceptions correctly inside getState()
9f9cac52 · peastman · 559c7cff · 44c8ea9c · 9f9cac52
Commit 9f9cac52 authored Sep 09, 2013 by peastman
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

wrappers/python/src/swig_doxygen/swig_lib/python/extend.i wrappers/python/src/swig_doxygen/swig_lib/python/extend.i +14 -2

No files found.
--- a/wrappers/python/src/swig_doxygen/swig_lib/python/extend.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/extend.i
@@ -14,7 +14,13 @@
    if (getForces) types |= State::Forces;
    if (getEnergy) types |= State::Energy;
    if (getParameters) types |= State::Parameters;
+    try {
        state = self->getState(types, enforcePeriodic, groups);
+    }
+    catch (...) {
+        Py_END_ALLOW_THREADS
+        throw;
+    }
    Py_END_ALLOW_THREADS
    return _convertStateToLists(state);
  }
@@ -157,7 +163,13 @@ Parameters:
    if (getForces) types |= State::Forces;
    if (getEnergy) types |= State::Energy;
    if (getParameters) types |= State::Parameters;
+    try {
        state = self->getState(copy, types, enforcePeriodic, groups);
+    }
+    catch (...) {
+        Py_END_ALLOW_THREADS
+        throw;
+    }
    Py_END_ALLOW_THREADS
    return _convertStateToLists(state);
  }