Merge branch 'master' of https://github.com/projectwonder/wonder

wocommunity · Jul 4, 2014 · cf34737 · cf34737
2 parents 5527efb + 36c9364
commit cf34737
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Frameworks/EOF/ERRest/Sources/er/rest/routes/ERXRouteController.java b/Frameworks/EOF/ERRest/Sources/er/rest/routes/ERXRouteController.java
@@ -1822,6 +1822,10 @@ public <T extends ERXRouteController> T controller(Class<T> controllerClass) {
 	 */
 	public void dispose() {
 		if (_shouldDisposeEditingContext && _editingContext != null) {
+			if(_editingContext instanceof ERXEC && ((ERXEC) _editingContext).isAutoLocked()) {
+				_editingContext.unlock();
+			}
+
 			_editingContext.dispose();
 			_editingContext = null;
 		}