 -- 
 2.3.2 (Apple Git-55)
 
+
+From f1b9c7533f292d28a8b7ccfc815365c8404ab6a6 Mon Sep 17 00:00:00 2001
+From: Jeroen Blankendaal <Jeroen@pc-jeroen.local>
+Date: Thu, 1 Oct 2015 21:22:31 +0200
+Subject: [PATCH 3/3] Only unlock when not already unlocked...
+
+---
+ .../effektif/workflow/impl/workflowinstance/WorkflowInstanceImpl.java  | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git effektif-workflow-impl/src/main/java/com/effektif/workflow/impl/workflowinstance/WorkflowInstanceImpl.java effektif-workflow-impl/src/main/java/com/effektif/workflow/impl/workflowinstance/WorkflowInstanceImpl.java
+index 84320c4..9ad8102 100644
+--- effektif-workflow-impl/src/main/java/com/effektif/workflow/impl/workflowinstance/WorkflowInstanceImpl.java
++++ effektif-workflow-impl/src/main/java/com/effektif/workflow/impl/workflowinstance/WorkflowInstanceImpl.java
+@@ -218,8 +218,9 @@ public class WorkflowInstanceImpl extends ScopeInstanceImpl {
+       } else {
+         workflowInstanceStore.flushAndUnlock(this);
+       }
+-    } finally {
++    } catch (RuntimeException ex) {
+       if (workflowInstance.lock != null) workflowInstanceStore.unlockWorkflowInstance(this.getId());
++      throw ex;
+     }
+   }
+ 
+-- 
+2.3.2 (Apple Git-55)
+

From eb96bb4a089015ed950e94348fe4637e92df12fc Mon Sep 17 00:00:00 2001
From: Jeroen Blankendaal <Jeroen@pc-jeroen.local>
Date: Thu, 1 Oct 2015 08:22:33 +0200
Subject: [PATCH 2/2] Unlock a workflowInstance when a runtime exception occurs

---
 .../effektif/workflow/impl/workflowinstance/WorkflowInstanceImpl.java   | 2 +-

From 68ecb1badc1209129be0b84560e07b410cbb56d4 Mon Sep 17 00:00:00 2001
From: Jeroen Blankendaal <Jeroen@pc-jeroen.local>
Date: Wed, 30 Sep 2015 09:09:33 +0200
Subject: [PATCH 1/3] Unlock a workflowInstance when a runtime exception occurs

---
 .../workflowinstance/WorkflowInstanceImpl.java     | 160 +++++++++++----------
